Commit Graph

16177 Commits

Author SHA1 Message Date
Adam Seaton
f6bee62b8e [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August
Bug:109889880
2018-06-18 17:28:17 +00:00
Nan Zhang
3af2baad0a Merge "Changed droiddoc.mk to support Metalava annotations." into pi-dev 2018-06-08 17:28:37 +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
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
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
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
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
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
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
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
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
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
Mathieu Chartier
96a8c23a73 Allow profiles for vendor modules
Allows speed-profile compiling vendor modules.

The profile will not correctly get copied during first boot, but this
is should only be a minor issue.

Bug: 78472563
Bug: 71901335
Test: make

Change-Id: I15c6f90b6bbd284ab48fd750267bed5189c9fea4
2018-05-22 13:33:10 -07:00
TreeHugger Robot
eeb98ae3df Merge "Add waves to vendor owner whitelist" into pi-dev 2018-05-22 07:26:54 +00:00
Alan Ma
c2e074c081 Add a build task for cts_instant
Test: With other CLs in the topic, run 'm -j30 cts_instant'

bug: 79750671
Change-Id: Ib0381017300108a22919892070540b9e7f92aaf9
2018-05-18 14:09:03 -07:00
Ivan Lozano
89d3bee91b Merge "Don't export UBSan minimal runtime symbols." into pi-dev 2018-05-16 21:37:30 +00:00
Adam Seaton
7bc3e17c05 Merge "DO NOT MERGE: Updating security string for pi-dev to 2018-06-05" into pi-dev 2018-05-16 20:54:29 +00:00
TreeHugger Robot
7f309d6e4d Merge changes If012c943,Ica275899 into pi-dev
* changes:
  Fix zipped resources
  Fix incorrect renderscript zip deps
2018-05-16 19:47:33 +00:00
Ivan Lozano
9588875e80 Don't export UBSan minimal runtime symbols.
When linking in the UBSan minimal runtime, don't export the symbols.
This was resulting in an edge case where symbols were sometimes
undefined at runtime on address sanitized builds if static library
dependencies were integer overflow sanitized.

Bug: 78766744
Test: readelf on libraries show either inclusion of the shared library
or no undefined symbols related to the minimal runtime.
Change-Id: I4382cc72baefd7fa96cd83e8349e82f7b083f5aa
Merged-In: I4382cc72baefd7fa96cd83e8349e82f7b083f5aa
(cherry picked from commit e508169caf)
2018-05-16 10:41:48 -07:00
Colin Cross
bdaada855f Fix zipped resources
Fix mismatch between output directory of zipsync and input
directory of aapt2.

Bug: 79481102
Test: m checkbuild
Change-Id: If012c943af0c04cc3f0dd5c4266126412ae0a759
Merged-In: If012c943af0c04cc3f0dd5c4266126412ae0a759
(cherry picked from commit 164a33f194)
2018-05-16 09:00:01 -07:00
Colin Cross
4390b78cc0 Fix incorrect renderscript zip deps
Fix some incorrect dependencies after I12d33e52019aebac6ea33271939228e4690a4173.

Bug: 73885582
Test: m java FORCE_AAPT2=true
Change-Id: Ica2758991603e1605f629d843d19df5e2ef4fae1
Merged-In: Ica2758991603e1605f629d843d19df5e2ef4fae1
(cherry picked from commit 1465806ff2)
2018-05-16 08:58:52 -07:00
Logan Chien
aee6e5dd3b Merge "Build a single GSI for O-MR1-VENDOR and Master-VENDOR" into pi-dev 2018-05-16 09:38:57 +00:00
Fang Deng
42b9e05754 [DO NOT MERGE][Harness Separation] Update cts.mk to point to the new harness repo
CTS harness code is moved to the new git project.
Update cts.mk to point to the new repo.

Bug: 78461075
Bug: 79201478
Bug: 79695450
Test: make cts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true
TARGET_PRODUCT=aosp_arm64
Test: cts-tradefed run cts --compatibility:include-filter
CtsGestureTestCases
Test: cts/run_unit_tests.sh
Test: make gts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true
TARGET_PRODUCT=aosp_arm64

Change-Id: I94c03071ec3db5a52c0fc0185bf69e2e57da9b21
2018-05-15 18:28:24 -07:00
Jasmine Cha
61b2c70815 Add waves to vendor owner whitelist
Bug: 74360112
Test: AOSP build pass
Change-Id: I7dd78f13fec495111d82828229afabe53abba712
2018-05-14 21:50:28 +00:00
TreeHugger Robot
42293db357 Merge "Create dist for boot and system jars" into pi-dev 2018-05-14 17:37:41 +00:00
Calin Juravle
8955a99f06 Create dist for boot and system jars
We need the jars on boot and system server classpath in order to
symbolize profile information. Having the jars packed in a dist zip will
help a lot with the tools.

Test: m
Bug: 73313191
Change-Id: I5b64268d240055282099e9b86a5e6869e6405968
2018-05-11 16:38:03 -07:00
Christopher Ferris
4d432b5455 Add support for cortex-a55/cortex-a75.
Bug: 78133793

Test: Builds for target.
Change-Id: I98d638017f943083d3832ec2211333c48f07caf2
(cherry picked from commit ce7bf678f2)
2018-05-11 11:23:17 -07:00
Mathieu Chartier
110d18d73c Merge "Add support for preopt with uses-libraries" into pi-dev 2018-05-10 18:37:12 +00:00
Logan Chien
d73b94c097 Build a single GSI for O-MR1-VENDOR and Master-VENDOR
The objective of this commit is to support these 3 combinations:

1. Master-GSI + Master-VENDOR (w/ BOARD_VNDK_VERSION)
2. Master-GSI + Master-VENDOR (w/o BOARD_VNDK_VERSION for upgrading devices)
3. Master-GSI + O-MR1-VENDOR (w/ BOARD_VNDK_VERSION)

This commit defines a new property `ro.vndk.lite` to indicate the status
of BOARD_VNDK_VERSION run-time enforcement.  Now, all devices should
have `ro.vndk.version` so that `libhidlbase.so`, `libRSCpuRef.so`, and
`libnativeloader.so` can find the versioned VNDK directory.

Bug: 78605339
Test: aosp_sailfish Master-SYSTEM + Master-VENDOR boots
Test: aosp_sailfish Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-SYSTEM + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + O-MR1-VENDOR boots
Change-Id: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
2018-05-10 21:17:58 +08:00
Jackal Guo
732ed64fbd Merge "Allow PRODUCT_COPY_FILES to copy raw APKs into system_other" into pi-dev 2018-05-10 03:14:12 +00:00
Mathieu Chartier
09f3b97f4b Add support for preopt with uses-libraries
Required libraries are specified with LOCAL_USES_LIBRARIES
Optional libraries are specified with LOCAL_OPTIONAL_USES_LIBRARIES

The make rule cross references the libraries against what's stored
in the manifest.

Verification is enabled if LOCAL_ENFORCE_USES_LIBRARIES is true. This
defaults to true if either of LOCAL_USES_LIBRARIES or
LOCAL_OPTIONAL_USES_LIBRARIES are specified.

Bug: 70934104
Bug: 67345922
Test: manual

Change-Id: Ifca7d1a993620e9d0e42dc497a4a5d7a6c3f4172
2018-05-09 16:52:10 -07:00
TreeHugger Robot
96ec5a58ae Merge "Pass PLATFORM_VERSION to Soong" into pi-dev 2018-05-09 21:32:08 +00:00
Colin Cross
34aba6cf72 Pass PLATFORM_VERSION to Soong
Soong needs PLATFORM_VERSION to pass as --version-name when building
framework-res.apk.

Bug: 78324052
Test: aapt dump badging $OUT/system/framework/framework-res.apk  | grep -i version
Change-Id: If47839182a1dd7c7a768b1253dd8b575d777ca7e
2018-05-09 11:10:15 -07:00
Dan Willemsen
68e1289626 Allow PRODUCT_COPY_FILES to copy raw APKs into system_other
Files in this partition aren't actually installed, so we don't need to
use the BUILD_PREBUILT logic for APKs.

Bug: 66960479
Test: try PRODUCT_COPY_FILES of an apk into system, errors
Test: try PRODUCT_COPY_FILES of an apk into system_other, accepted
Change-Id: Ie721d2b884c6badfbe0e46f55c265b770bed618b
Merged-In: Ie721d2b884c6badfbe0e46f55c265b770bed618b
(cherry picked from commit 7d957c911a)
2018-05-09 06:38:28 +00:00
android-build-team Robot
5739f2b53b Merge "Fix support libraries dependencies based on Soong modules" into pi-dev 2018-05-04 00:55:40 +00:00
android-build-team Robot
9665c10777 Merge "PLATFORM_PREVIEW_SDK_VERSION should be 0" into pi-dev 2018-05-04 00:12:35 +00:00
Colin Cross
c9c5dc89cd Fix support libraries dependencies based on Soong modules
Use a list of support library java and android libraries exported
from Soong to rewrite dependencies into the appropriate
LOCAL_STATIC_JAVA_LIBRARIES and LOCAL_STATIC_ANDROID_LIBRARIES.

Bug: 78300023
Test: m checkbuild
Change-Id: I4fd1e563272fcef9238a46cda840210529bd706a
Merged-In: I4fd1e563272fcef9238a46cda840210529bd706a
(cherry picked from commit ceadbadc5d)
2018-05-03 15:47:41 -07:00
Fang Deng
428d477bf1 Merge "[Harness Separation] Move cts-tradefed to a new dir (cts.mk)" into pi-dev 2018-05-03 22:39:46 +00:00
Ian Pedowitz
23898eed9d PLATFORM_PREVIEW_SDK_VERSION should be 0
It is already set to 0 because of REL, but explicitly set it

Bug: 77589980
Test: N/A
Change-Id: I97839c7dc09f8313f767635469f27b2a0d0e5010
2018-05-03 15:27:27 -07:00
Colin Cross
2a5370179a Merge changes from topic "soong_support_lib_pi_dev_prereqs" into pi-dev
* changes:
  Regenerate R.java files from LOCAL_STATIC_ANDROID_LIBRARIES
  Allow Soong to export multiple proguard flags files
  Fix echo when copying package-res.apk
  Allow soong java libraries to include exported resources and proguard flags
2018-05-03 21:47:25 +00:00
Fang Deng
8ebc942152 [Harness Separation] Move cts-tradefed to a new dir (cts.mk)
Move cts-tradefed to a new dir.
Fix cts.mk to point to the new dir.
Bug: 78461075
Bug: 79201478
Test: make cts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true TARGET_PRODUCT=aosp_arm64
Test: cts-tradefed run cts --compatibility:include-filter CtsGestureTestCases
Test: cts/harness/tools/cts-tradefed/tests/run_tests.sh
Test: make gts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true TARGET_PRODUCT=aosp_arm64

Change-Id: I8b610bf2f0b84baa7e8a30759f7d53d1b2a5d8f1
2018-05-03 10:53:37 -07:00
Mathieu Chartier
b17f384dd7 Merge "Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set" into pi-dev 2018-05-02 23:13:42 +00:00
Colin Cross
43641b5e1f Regenerate R.java files from LOCAL_STATIC_ANDROID_LIBRARIES
If a static android library lib1 has LOCAL_STATIC_ANDROID_LIBRARIES
lib2, then the R.class files for packages in lib2 will be merged
into the jar for lib1.  If an app has lib1 in its
LOCAL_STATIC_ANDROID_LIBRARIES it will get the R.class files from
lib2 through lib1, instead of regenerating the R.java files with
numbering that matches the resource table of the app.

This was worked around for support libraries by keeping a
fix_dependencies.mk that added transitive static support libraries
to the direct static dependencies of apps.  Instead, propagate
the packages that aapt2 generated R.java files for up as
--extra-packages arguments to the next aapt2 invocation, which
will force aapt2 to regenerate the R.java files for those packages.

Bug: 78300023
Test: m checkbuild
Change-Id: I7375e13241b4c4f2933032409fb7935abe133bfc
Merged-In: I7375e13241b4c4f2933032409fb7935abe133bfc
(cherry picked from commit 43c247e181)
2018-05-02 15:31:03 -07:00
Colin Cross
0fd1234427 Allow Soong to export multiple proguard flags files
Soong uses lists of proguard flags files from dependencies instead
of a single concatenated file.  Allow Soong to pass the list to
make, which will concatenate it.

Move the check inside ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
in case Soong exports an Android library with an empty
LOCAL_SOONG_EXPORT_PROGUARD_FLAGS.

Bug: 73724997
Test: m checkbuild
Change-Id: Ia8f229ec5f9fc99a23bd471dfa70c9de7316de94
Merged-In: Ia8f229ec5f9fc99a23bd471dfa70c9de7316de94
(cherry picked from commit 42669e6dc7)
2018-05-02 15:31:03 -07:00