Commit graph

43827 commits

Author SHA1 Message Date
Nan Zhang
3af2baad0a Merge "Changed droiddoc.mk to support Metalava annotations." into pi-dev 2018-06-08 17:28:37 +00:00
Bo Hu
8e2f247ca1 Merge "emulator: allows vendor_init to set qemu_props" into pi-dev 2018-06-08 02:48:22 +00:00
Adam Seaton
f20c71f190 Update Platform security string to 08-05 for August release
bug: 109889880
2018-06-07 14:52:58 -07:00
Yao Chen
50e6c49020 Merge "Add a system property to indicate if statsd should start" into pi-dev 2018-06-07 21:10:15 +00:00
Nan Zhang
013b0d42dd Changed droiddoc.mk to support Metalava annotations.
Test: manually cp stub-annotations.jar to pi-dev; and m -j metalava_android_stubs
Bug: b/78245848
Change-Id: If1ff99ca6d7c55a4d6880ad2fe85c66a0a62a490
Merged-In: I53bb68f7bdedd768a7e3dd7cb1c6fc18c2181b9b
2018-06-07 13:14:02 -07:00
bohu
7cdfd674d5 emulator: allows vendor_init to set qemu_props
BUG: 109872686

this cl only impacts emulator images

Change-Id: I93b8489f710d194917d4b482ebca960c39658fd9
2018-06-07 09:19:19 -07:00
TreeHugger Robot
ff48801c0d Merge "Remove AB update in GSI" into pi-dev 2018-06-07 03:34:12 +00:00
Yao Chen
b76f355f4e Add a system property to indicate if statsd should start
Bug: 79324611
Test: manually tested on marlin_svelte
Change-Id: Id0becd80bd58806b674ac60903bad7fd39d7594b
2018-06-06 17:22:57 -07:00
Nan Zhang
d46e250b8b Merge "Change droiddoc.mk to support metalava" into pi-dev 2018-06-06 23:01:51 +00:00
Nan Zhang
d058de4a77 Change droiddoc.mk to support metalava
Test:  Manually checked-in prebuilt metalava.jar to my local src tree and
      compare the results between old and new docs/stubs generation.
Bug: b/78245848

Change-Id: Ied81cba53c483d4cfb5720e6325b299a1b32104e
Merged-In: I44b4b8ba248ad4deafbb6462e6f7398f15bd2845
2018-06-06 13:32:54 -07:00
Tom Cherry
ef449b9250 Merge "Remove comment line in generated passwd file" into pi-dev 2018-06-06 20:06:02 +00:00
SzuWei Lin
3905b85c0a Remove AB update in GSI
Bug: 80554868
Test: Boot a pixel device with GSI applied the patch
Change-Id: If37fa2e6c2909705492863788c222b954e784741
2018-06-06 18:02:27 +08:00
Sunny Goyal
47acd31f57 Changing the default launcher and recents implementation for system build
Bug: 77490347
Test: Build and flashed system image
Change-Id: I71dbd7eb731c70656bb816848027626b2c7430cc
2018-06-05 21:15:06 +00:00
Wei Wang
47ca9f801f Remove comment line in generated passwd file
The man page for the password file (man 5 passwd) does not mention any
provisions for comment line other than comment field

Bug: 109748241
Test: Build and check generated file
Change-Id: I2912d0844cf3f077184129d1a0121b50b09ef1e3
2018-06-05 12:24:21 -07:00
TreeHugger Robot
b2a5515585 Merge "Set proper CPU variant for aosp_arm" into pi-dev 2018-06-05 18:34:41 +00:00
bohu
62d494b3fd emulator: add host tools to sdk_phone_x86/64
Fix sdk_x86-sdk build breakage that requires host tools.

BUG: 109716817
Test: make -j110 PRODUCT-sdk_x86-sdk showcommands dist DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk/4821124 sdk_repo
Change-Id: I7b0b4d0e3b2c79bad305bc11a5c1d04eb1f2bdd1
2018-06-05 00:01:36 -07:00
bohu
c5e25e9b84 emulator: base sdk_phone_x86/64 images on aosp
BUG: 79941736

this cl only impacts emulator images

Change-Id: I63bc56ba69d313515ec3a1c73206f9a125a697ab
2018-06-04 14:11:55 -07:00
TreeHugger Robot
cd42897025 Merge "Clean up deprecated properties. Set sepolicy for vendor process" into pi-dev 2018-06-04 20:43:42 +00:00
Adam Seaton
889775dff3 Merge "DO NOT MERGE Update Platform Security String to 2018-07-05 for pi-dev bug: 79883349" into pi-dev 2018-06-04 18:18:18 +00:00
huans
360eb865ed Clean up deprecated properties. Set sepolicy for vendor process
Bug: 79941736
Test: Manually
Change-Id: Ia7ec0d90be1dbce402b8b6b52762c7384c0d5e1e
2018-06-04 11:02:12 -07:00
Adam Seaton
97c4839717 [automerger skipped] Merge "DO NOT MERGE: Update Platform Security String to 2018-07-05 for oc-mr1-dev Bug:79883349" into oc-mr1-dev
am: 64cc99f197  -s ours

Change-Id: Iee49b1a2e3b0443521e35fcda43a07b983b333a7
2018-06-04 09:55:12 -07:00
Bo Hu
63762bdf41 Merge changes from topic "emulator-gsi-configs" into pi-dev
* changes:
  Update the rild.libpath to vendor.rild.libpath for aosp_$arch
  emulator:  add missing apns config
2018-06-04 16:29:36 +00:00
TreeHugger Robot
52f964deb6 Merge "Add broadcast radio service for emulator" into pi-dev 2018-06-04 13:45:18 +00:00
TreeHugger Robot
64cc99f197 Merge "DO NOT MERGE: Update Platform Security String to 2018-07-05 for oc-mr1-dev Bug:79883349" into oc-mr1-dev 2018-06-02 01:10:13 +00:00
Adam Seaton
9b8b5854e8 DO NOT MERGE Update Platform Security String to 2018-07-05 for pi-dev
bug: 79883349
2018-06-01 23:03:44 +00:00
Adam Seaton
cfbe84b8a0 DO NOT MERGE: Update Platform Security String to 2018-07-05 for oc-mr1-dev
Bug:79883349
2018-06-01 23:00:36 +00:00
TreeHugger Robot
fcf60d8f8a Merge "Do not copy userdata.img into sdk_addon/system-image.zip" into pi-dev 2018-06-01 05:01:50 +00:00
TreeHugger Robot
2b7b307a4b Merge "Install product shared libraries in /product/lib" into pi-dev 2018-06-01 01:00:28 +00:00
David Brazdil
68ca409c5c Merge "Add new file name constant for public DEX API file" into pi-dev 2018-05-31 12:20:57 +00:00
Isaac Chen
b2e58893c3 Set proper CPU variant for aosp_arm
System image of aosp_arm products is the new GSI in Pi.
Its arch variants need to be the same as the legacy GSI built
with aosp_arm_ab so it can pass related CTS/VTS tests.

Bug: 80401108
Test: $ lunch aosp_arm-userdebug; m -j; emulator # booted OK
      $ lunch aosp_arm-userdebug; m -j cts

Change-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
2018-05-31 10:01:08 +08:00
Inseob Kim
8b48f56e87 Install product shared libraries in /product/lib
This is to support /product/lib. Shared libraries with
LOCAL_PRODUCT_MODULE := true or product_specific: true has been
installed in /system/lib. They are now installed in /product/lib.

Bug: 73095206
Test: build succeeded && product libraries are installed under
/product/lib

Change-Id: Ic49a0a3e1e47666c4d15189ab6fded8007ecb498
Merged-In: Ic49a0a3e1e47666c4d15189ab6fded8007ecb498
(cherry picked from commit 47c13524aa)
2018-05-31 09:57:22 +09:00
huans
ae665f0833 Update the rild.libpath to vendor.rild.libpath for aosp_$arch
bug: 80137441

Test: build and runaosp_x86-userdebug. adb logcat -b radio.
check the rild read the right property vendor.rild.libpath

Change-Id: I0529c32b79cf791821d71369bcd0fb244c13361c
2018-05-30 14:48:31 -07:00
huans
3d31afe594 emulator: add missing apns config
We add goldfish specific apns config files to /data/misc/apns/etc/
for aosp_* targets to have working telephony and wifi.

BUG: 79584197
Change-Id: I46591d923496420212cd279c0b90f0b4eb11cea4
2018-05-30 14:48:25 -07:00
Andrew Hsieh
c99e68684c Merge "Build VNDK snapshot for products aosp_[arm|x86]" into pi-dev 2018-05-30 21:17:48 +00:00
David Brazdil
12fe6f01e3 Add new file name constant for public DEX API file
We need to generate a new file from Doclava. Create a global variable
for the file name.

Bug: 64382372
Bug: 80461842
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Merged-In: Id850327c29bc626d3d721935edcb2b7afd2fd283
Change-Id: Icd0de1361879b896fd9d3881e405def98c012f0c
2018-05-30 14:13:14 +01:00
Jae Shin
3ba44eb916 Build VNDK snapshot for products aosp_[arm|x86]
P VNDK snapshot needs to include VNDK libs built for 64-bit binder
products, aosp_arm and aosp_x86. This change modifies the following:

1) Revise VNDK snapshot zip file name to use $TARGET_PRODUCT instead of
$TARGET_ARCH in order to distinguish aosp_arm and aosp_arm_ab.
2) Place 32-bit binder libs under a subdirectory 'binder32' such that
the snapshots can be uploaded to prebuilts/vndk/v{VER} with the following
directory structure:

  prebuilts/vndk/v{VER}/
    arm/
      arch-arm-armv7-a-neon/
        shared/
          ...
      binder32/
        arch-arm-armv7-a-neon/
          shared/
            ...
      ...
    arm64/
      arch-arm-armv7-a-neon/
      arch-arm64-armv8-a/
      ...
    ...

The 32-bit binder libs will be placed in a separate subdirectory so that
they can be easily phased out in future VNDK snapshots.

Bug: 80372796
Test: make -j vndk dist
Change-Id: I7cde2e706e0c2891bab762b9057672f57e798873
2018-05-30 21:23:57 +09:00
SzuWei Lin
5d356e2397 Enable metadata in GSI
Add BOARD_USES_METADATA_PARTITION to GSI to enable metadata folder
under the root folder.

Bug: 80407843
Bug: 79781913
Test: Boot on a Pixel device with GSI applied the patch
Change-Id: I5544b76b54300aa5a87aa4fa3c0ec6feff13a554
2018-05-30 17:01:49 +08:00
Tao Bao
221be663d1 Merge "Expose PLATFORM_SECURITY_PATCH_TIMESTAMP." into pi-dev 2018-05-30 05:02:33 +00:00
TreeHugger Robot
d16a9fef12 Merge "Fix OWNERS on version_defaults.mk" into pi-dev 2018-05-30 02:30:38 +00:00
Tao Bao
48bbb1ba67 Expose PLATFORM_SECURITY_PATCH_TIMESTAMP.
We have use case that uses the timestamp for PLATFORM_SECURITY_PATCH in
device specific Makefile, but need to handle the platform-dependent
`date` command. This CL computes and exposes
PLATFORM_SECURITY_PATCH_TIMESTAMP from the core build system.

Bug: 80311893
Test: Use PLATFORM_SECURITY_PATCH_TIMESTAMP in device-specific folder,
      on both of Linux and macOS. Check the value.
Change-Id: I27a88dcebde7a1c204491f5f5c45c5160398dbb6
Merged-In: I27a88dcebde7a1c204491f5f5c45c5160398dbb6
(cherry picked from commit 717d9d3ae2)
2018-05-29 15:34:08 -07:00
Dan Willemsen
4d0694a3c8 Fix OWNERS on version_defaults.mk
Bug: 80311893
Change-Id: I904ed66ebe3d09c7d66dd3f845d9e049b15da192
2018-05-29 22:31:24 +00:00
Weilun Du
d61ff0f5e2 Do not copy userdata.img into sdk_addon/system-image.zip
userdata.img becomes 4GB in P and it doesn't work well with patcher in
android studio. We decided to remove userdata.img in system image zip
and generate userdata.img by emulator.
This cl does not impact real devices.

BUG: 79925096

Change-Id: I5406b28291f140e2ebdbcd7c6f684f60ac59b62b
Signed-off-by: Weilun Du <wdu@google.com>
2018-05-29 22:24:29 +00:00
Vishwath Mohan
f8d4dc5787 Apply CFI include paths to all product configs.
The current VNDK ABI snapshot expects that CFI is disabled for
components that either in the include paths (from cfi-common.mk) OR
enabled directly in the makefile/blueprint. However, on non-arm64
architectures, the build system was only disabling CFI for vendor
components in the include paths.

This topic corrects it by (a) removing the include paths check to disable
CFI for vendor variants, and (b) inheriting the CFI include paths in
all product configs to ensure that when we update the ABI we're able
to move to relying exclusively on (PRODUCT_)CFI_INCLUDE_PATHS.

Bug: 66301104
Test: ABI matches for all architectures.
Change-Id: I4d845cd9925354d565e06020c479cc3f7ab28f61
2018-05-28 13:51:05 -07:00
Yahan Zhou
6d6d4702d5 Add broadcast radio service for emulator
This cl does not impact real devices.

BUG: 79750456

Test: atest VtsHalBroadcastradioV1_0Target
Change-Id: I6fac31902a8414e550b9053b6985f818674b3e9d
2018-05-25 22:16:26 +00:00
Vishwath Mohan
014d1fc969 Enable CFI for vendor components on aosp_arm64_ab product-configs
The aosp_arm64_ab product config needs to also enable CFI for some
vendor components (if they exist).

Bug: 66301104
Test: lunch aosp_arm64_ab-userdebug && m -j40
Change-Id: Iae670c2d44c00d3dfb0e312e1492b37bbb737d4f
2018-05-25 07:01:09 -07:00
TreeHugger Robot
d002e49501 Merge "Enable CFI by default but restrict CFI_INCLUDE_PATHS" into pi-dev 2018-05-25 07:15:45 +00:00
Vishwath Mohan
6106a4ead5 Enable CFI by default but restrict CFI_INCLUDE_PATHS
This CL enables CFI on security sensitive components for product
configs that inherit core_64_bit.mk (and core_64_bit_only.mk). Note
that this only requests the build system to do so. Internal build
logic will dictate if this is actually enabled on the build or
not (CFI is currently disabled for ARM32 and MIPS for example).

In addition, this also restricts CFI_INCLUDE_PATHS and
PRODUCT_CFI_INCLUDE_PATHS to Arm64 architectures only. This helps
narrow which targets enable CFI out of the box.

Bug: 66301104
Test: CFI is enabled on aosp_* targets
Change-Id: I52af499dc34cd4b42fbfb1175f6a37aaf17b65dd
2018-05-24 22:14:03 -07:00
TreeHugger Robot
bd03c1513f Merge "Pack additional AVB testkeys into otatools.zip." into pi-dev 2018-05-25 02:42:41 +00:00
Ruchi Kandoi
2dcba6fed7 Adds SecureElement apk to core_minimal.mk and core_tiny.mk
Bug: 79999791
Bug: 80000595
Test: CtsOmapiTestCases; works on phones/tablets, needs to be
verified on wearables
Change-Id: I114b9d02097e880d8369b75790fae5b995db8e59
2018-05-24 21:57:03 +00:00
Tao Bao
ba822a97cd Pack additional AVB testkeys into otatools.zip.
Bug: 71372646
Test: `m -j otatools-package`; Check $OUT/otatools.zip.
Change-Id: I42ad9047d1c5873b7770dc1f92757cd9e5e047ba
Merged-In: I42ad9047d1c5873b7770dc1f92757cd9e5e047ba
(cherry picked from commit 2d0e5124b0)
2018-05-24 10:07:30 -07:00