Commit Graph

16823 Commits

Author SHA1 Message Date
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
Colin Cross
b8adc47b4b Merge "Use AAPT2 by default" am: 90b890f9f2
am: d04efa590b

Change-Id: I54e2e9251c0407052b5770120374b3bcf8e0415f
2018-05-22 11:06:14 -07:00
Colin Cross
90b890f9f2 Merge "Use AAPT2 by default" 2018-05-22 17:45:20 +00:00
Tri Vo
494830879c Account for multiple BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR dirs
After https://android-review.googlesource.com/688488
BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR can now specify multiple
directories.

Bug: n/a
Test: build sepolicy

Change-Id: Id850327c29bc626d3d721935edcb2b7afd2fd283
2018-05-22 09:24:10 -07:00
Jiyong Park
565ec59f1f org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl
The name of the runtime library name for the SDK library
org.apache.http.legacy has changed to org.apache.http.legacy.impl as it
is now built using java_sdk_library construct where *.impl suffix is
automatically added to the runtime lib.

Bug: 77577799
Test: m -j
Merged-In: Ie049d06d78cc403454c2885def88a167975b4204
Change-Id: Ie049d06d78cc403454c2885def88a167975b4204
(cherry picked from commit 7f9a1a49cf)
2018-05-22 20:37:30 +09:00
Jiyong Park
c98eb5b5b8 org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl
The name of the runtime library name for the SDK library
org.apache.http.legacy has changed to org.apache.http.legacy.impl as it
is now built using java_sdk_library construct where *.impl suffix is
automatically added to the runtime lib.

Bug: 77577799
Test: m -j
Merged-In: Ie049d06d78cc403454c2885def88a167975b4204
Change-Id: Ie049d06d78cc403454c2885def88a167975b4204
(cherry picked from commit 7f9a1a49cf)
2018-05-22 20:13:30 +09:00
Jasmine Cha
a2423094a0 Merge "Add waves to vendor owner whitelist" into pi-dev
am: eeb98ae3df

Change-Id: Ia9ddc90c477170b0afc2e77b7499d3403eb332e1
2018-05-22 00:31:32 -07:00
TreeHugger Robot
eeb98ae3df Merge "Add waves to vendor owner whitelist" into pi-dev 2018-05-22 07:26:54 +00:00
Logan Chien
fcf4d7200a Merge "Build a single GSI for O-MR1-VENDOR and Master-VENDOR" 2018-05-22 04:04:07 +00:00
Colin Cross
ba7699fb9a Use AAPT2 by default
Switch to using AAPT2 by default.  Can be disabled globally with
FORCE_AAPT2=false or per-module with LOCAL_USE_AAPT2 := false.

Bug: 79481102
Test: m checkbuild
Change-Id: I35719f708fa3bcc1d54721e62ac9cc8780f7cbbe
2018-05-22 01:21:55 +00:00
Alan Ma
4292ea6696 Merge "Add a build task for cts_instant" into pi-dev
am: 07d33802b3

Change-Id: Ide0ee7a30700a34823abed77493fba4f55458517
2018-05-21 13:30:41 -07: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
Colin Cross
be91cfdbbc Merge "Move support library dependency munging earlier" am: 7e15b44c23
am: 61377fb72a

Change-Id: I75edb7e891e014068530a227240cc2b2929d9b62
2018-05-17 17:27:08 -07:00
Colin Cross
db67232b77 Merge "Don't recompute location of AndroidManifest.xml" am: 1b02cfd8ab
am: 8deac847c3

Change-Id: I9eb0138e0f62c7b658272aa826674f13b50c5213
2018-05-17 17:26:14 -07:00
Treehugger Robot
7e15b44c23 Merge "Move support library dependency munging earlier" 2018-05-18 00:00:50 +00:00
Treehugger Robot
1b02cfd8ab Merge "Don't recompute location of AndroidManifest.xml" 2018-05-18 00:00:24 +00:00
Colin Cross
7bc6cab12e Move support library dependency munging earlier
The presence of LOCAL_STATIC_ANDROID_LIBRARIES is used early to
decide whether to move resources to overlays, and late to decide
whether to add --auto-add-overlay.  If support_libraries.mk moves
the last LOCAL_STATIC_ANDROID_LIBRARIES value to
LOCAL_STATIC_JAVA_LIBRARIES then the resources will be moved to
overlays but --auto-add-overlay will not be added, causing aapt2
to fail with:
error: resource bool/leanback_outline_clipping_disabled does not override an existing resource.
note: define an <add-resource> tag or use --auto-add-overlay.

Bug: 79481102
Test: m FORCE_AAPT2=true java
Change-Id: Icc67acf23b846bd506a5d397d02ad5775ad0ea1d
2018-05-17 15:09:17 -07:00
Colin Cross
1c3d83b64c Don't recompute location of AndroidManifest.xml
The location of AndroidManifest.xml has already been computed
by android_manifest.mk, don't duplicate the logic.  Fixes an
extra regeneration triggered by $(wildcard $(my_android_manifest))
when LOCAL_FULL_MANIFEST_FILE points to a generated file, which
will not exist on the first run of kati.

Test: m
Change-Id: Ia56693a4dbbc7d78900019b887f766938dc55dab
2018-05-17 15:09:17 -07:00
Colin Cross
8e7d3fb134 Merge "Don't always filter out --auto-add-overlay" am: e3c456423e
am: 4ab479a771

Change-Id: Icc7d1d911904c36684d89c20881002c3c8978175
2018-05-17 12:11:34 -07:00
Colin Cross
e3c456423e Merge "Don't always filter out --auto-add-overlay" 2018-05-17 18:52:53 +00:00
Colin Cross
282065ab15 Don't always filter out --auto-add-overlay
There are some cases where --auto-add-overlay is added for legitimite
reasons, for example in RROs.  Only filter it out from modules that
were using --extra-packages for support library modules.

Test: m FORCE_AAPT2=true java
Change-Id: I165fa577f2204ecbc57e71f946db3f346568ad81
2018-05-17 10:16:04 -07:00
Logan Chien
86b52aec24 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
Merged-In: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
(cherry picked from commit d73b94c097)
2018-05-17 14:25:15 +08:00
Mathieu Chartier
e5f8747de8 Merge "Move back to using COMMON jars for preopt dependencies" am: 625ad4a0c8
am: 195be3d799

Change-Id: If05aed6ba98eb7aa664645bdf4017c6a89b2b83b
2018-05-16 16:06:16 -07:00
Mathieu Chartier
625ad4a0c8 Merge "Move back to using COMMON jars for preopt dependencies" 2018-05-16 22:59:23 +00: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
7a95f884cc Merge "DO NOT MERGE: Updating security string for pi-dev to 2018-06-05" into pi-dev
am: 7bc3e17c05

Change-Id: I40ee666e90f8bac02df5d2679fd76c5a66cc86ff
2018-05-16 14:03:44 -07: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
Colin Cross
0829421012 Merge "Pass 0 to llvm-rs-cc for current" am: 4a8b593768
am: 8ae7420c9a

Change-Id: Ib52235e5bb9011c4526531b68ea90f43741ed351
2018-05-16 12:44:15 -07: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
e2f541bb9f Pass 0 to llvm-rs-cc for current
Apparently empty PRIVATE_RS_TARGET_API is not the same as current,
pass 0 explicitly.

Test: forrest ub-renderscript-test
Change-Id: I8b2001b12161f07c404f78f63a80d82dffa1075f
2018-05-16 09:57:10 -07:00
Mathieu Chartier
c52de423af Move back to using COMMON jars for preopt dependencies
There are too many problems when using the stripped jars. One of them
being that the OatFileAssistant can't open the dex files since the
dex location stored in hte oat file is the system partition one.

Bug: 67345922
Bug: 70934104
Test: make
Change-Id: I3812471330ec1d2e3a435f42a3e975de750004ff
2018-05-16 09:56:58 -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
4f03bf9972 Merge "Build a single GSI for O-MR1-VENDOR and Master-VENDOR" into pi-dev
am: aee6e5dd3b

Change-Id: Idbbaac7407175b38882c341b8b4075bd1f2b2152
2018-05-16 02:45:43 -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
Colin Cross
5fda7459c5 Merge "Fix incorrect renderscript zip deps" am: d350b16d50
am: 3812eba34c

Change-Id: I2e149978fdc223f5c9f3a4e17855816074442a72
2018-05-16 00:24:55 -07:00
Colin Cross
8ec6febb48 Merge "Allow modules to override FORCE_AAPT2=true with LOCAL_USE_AAPT2 := false" am: 00794848df
am: 1ed070a524

Change-Id: I45d346fb9f69f8c3f9dad45406d31a5372933b9f
2018-05-16 00:20:53 -07:00
Treehugger Robot
d350b16d50 Merge "Fix incorrect renderscript zip deps" 2018-05-16 07:13:01 +00:00
Treehugger Robot
00794848df Merge "Allow modules to override FORCE_AAPT2=true with LOCAL_USE_AAPT2 := false" 2018-05-16 07:10:04 +00:00
Fang Deng
901f056e5d Merge "[DO NOT MERGE][Harness Separation] Update cts.mk to point to the new harness repo" into pi-dev
am: 7c2a9d258f

Change-Id: I57cfbd587b71aa14783b0ec140dff7628968f42f
2018-05-15 21:42:01 -07:00
Jiyong Park
025994b3c0 Merge "When building unbundled apps, link to the prebuilt stubs lib" am: 7207e41ddd
am: 86091aab1d

Change-Id: Ic760e8cf22834a026d8ed98c037361533c2bb9e1
2018-05-15 20:45:38 -07:00
Treehugger Robot
7207e41ddd Merge "When building unbundled apps, link to the prebuilt stubs lib" 2018-05-16 02:39:01 +00:00
Nan Zhang
90f94965ab Merge "Remove tasks/apicheck.mk" 2018-05-16 01:40:53 +00:00
Colin Cross
699e28bea1 Merge "Support LOCAL_RENDERSCRIPT_TARGET_API := current" am: 60e9f76bc2
am: 8410b0edcb

Change-Id: I82dc81b15448658b67910cd6a8817e4e3f924f79
2018-05-15 18:29:46 -07: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
Jiyong Park
45bb10c470 When building unbundled apps, link to the prebuilt stubs lib
There was a bug that when an unbundled app is built without SDK
(LOCAL_SDK_VERSION isn't set), it is linked to the nonexisting stubs
library from java_sdk_library. The built stubs libs are not created for
unbundled builds. For unbundled builds, we need to use the prebuilt
stubs lib.

Bug: 77575606
Test: m -j
Test: make -j dist
ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk

Change-Id: I70cced1c872053e151fea157e3a6d218b1fab9dc
2018-05-16 09:55:47 +09:00
Colin Cross
1465806ff2 Fix incorrect renderscript zip deps
Fix some incorrect dependencies after I12d33e52019aebac6ea33271939228e4690a4173.

Bug: 73885582
Test: m java FORCE_AAPT2=true
Change-Id: Ica2758991603e1605f629d843d19df5e2ef4fae1
2018-05-15 16:04:47 -07:00
George Burgess IV
63868edc92 Merge "Disable dtor inlining for clang-tidy" am: e51fcf01bd
am: e19014c924

Change-Id: Id9ab3c326c1ba5ade3398beadd5b1a87139ff7a4
2018-05-15 15:41:20 -07:00
Colin Cross
d443244fbf Allow modules to override FORCE_AAPT2=true with LOCAL_USE_AAPT2 := false
Bug: 79481102
Test: m java FORCE_AAPT2=true
Change-Id: Iece2158dc887a249eb51086b2497b170b5879979
2018-05-15 15:28:22 -07:00