Dan Willemsen
a7ce5fe735
Merge "Update the docs for 'mm[m][a]'" am: 49aa6fc009
...
am: e9f389fc3e
Change-Id: Ib81ff4732bf6575568bae97f952e15a8727de3f9
2019-11-01 00:04:59 -07:00
Dan Willemsen
e9f389fc3e
Merge "Update the docs for 'mm[m][a]'"
...
am: 49aa6fc009
Change-Id: I9d27a32335626b55dcfa66ee1a1a8d36f6e4651f
2019-10-31 23:58:17 -07:00
Treehugger Robot
49aa6fc009
Merge "Update the docs for 'mm[m][a]'"
2019-11-01 06:42:14 +00:00
Raff Tsai
0141e45b96
Revert "Move partition size checks to python script"
...
This reverts commit a4906cd306
.
Reason for revert: b/143734706
Change-Id: I905bd9c0bfcbd123c8f9e78986bfcb5600a9eca9
2019-11-01 05:36:20 +00:00
Yo Chiang
670e6d74aa
Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI
...
Bug: 141972143
Test: lunch mainline_system_arm64-userdebug ; m
Test: TH build_test
Merged-In: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
Change-Id: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
(cherry picked from commit 2ccc153d42
)
2019-11-01 10:39:34 +08:00
Jooyung Han
f0f88382cc
Merge "Use MakeVar from soong instead of hardcoding" am: 41055047da
...
am: 0ffb433903
Change-Id: Ia417176317aea5c87a73357a703fe7a9fcfc1218
2019-10-31 19:19:07 -07:00
Yifan Hong
50337f1b2e
Merge "Move partition size checks to python script" am: 8244f27722
...
am: 9fc6b8d8c4
Change-Id: Ic36faf88b3fd424b72ae2a41056068f811cfada6
2019-10-31 19:18:14 -07:00
Jooyung Han
0ffb433903
Merge "Use MakeVar from soong instead of hardcoding"
...
am: 41055047da
Change-Id: I50253df8c17f9745b3a026c56cf316c93cd0525f
2019-10-31 19:13:01 -07:00
Yifan Hong
9fc6b8d8c4
Merge "Move partition size checks to python script"
...
am: 8244f27722
Change-Id: I7e9f05ff4c25d70699ae79f5cdfb19597a81d722
2019-10-31 19:12:10 -07:00
Jooyung Han
41055047da
Merge "Use MakeVar from soong instead of hardcoding"
2019-11-01 01:57:50 +00:00
Yifan Hong
8244f27722
Merge "Move partition size checks to python script"
2019-11-01 01:52:11 +00:00
Yi-yo Chiang
e167e0df1f
Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI" into qt-qpr1-dev-plus-aosp
2019-11-01 01:26:47 +00:00
Roland Levillain
d5281547cc
Merge "Implement APEX JAR (Java library) absence checks for Core Libraries." am: 374213db0d
...
am: ba88c3be5c
Change-Id: I39709701f2ce1e2d4b5cf631822f29d78958bae9
2019-10-31 14:24:33 -07:00
Ashwini Oruganti
e575157366
Remove the cert for GooglePermissionController
...
We no longer need to specify seinfo for privapps when defining rules in
seapp_contexts. And so, we also no longer need to have the key here.
Bug: 142672293
Test: Happy builds.
Change-Id: I0d67844db5a59c445f76e2aef0a13446e486a193
2019-10-31 14:12:08 -07:00
Raman Tenneti
3fa302e04f
Delete AOSP/Email app.
...
BUG: 139497239
Test: Manual
$ make -j 40
Change-Id: I2a32694b899bc4f0a0ba36b152c06689427dabf4
Merged-In: I2a32694b899bc4f0a0ba36b152c06689427dabf4
2019-10-31 21:08:03 +00:00
Xin Li
37422c450f
Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master
...
am: 81e3eb8597
Change-Id: I002b3be6b6b097a3fe2ad82dea49a4070196c8d3
2019-10-31 14:06:36 -07:00
Xin Li
ca3235f84c
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
am: 5cf7c45d0c
Change-Id: Iae4ee3b53aa80d36851387d0b6453c7c14a282b3
2019-10-31 13:13:49 -07:00
Roland Levillain
ba88c3be5c
Merge "Implement APEX JAR (Java library) absence checks for Core Libraries."
...
am: 374213db0d
Change-Id: I690908bea6727c8f26d76105e53740a4e6488f59
2019-10-31 12:22:29 -07:00
Roland Levillain
374213db0d
Merge "Implement APEX JAR (Java library) absence checks for Core Libraries."
2019-10-31 19:03:22 +00:00
TreeHugger Robot
81e3eb8597
Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master
2019-10-31 18:38:43 +00:00
Yifan Hong
a4906cd306
Move partition size checks to python script
...
Easier to read and modify its logic.
Test: builds
Test: test_check_partition_sizes
Test: atest releasetools_test
Test: atest releasetools_py3_test
Change-Id: I73204664b64a0bcee7375fa6fca46758d5a2bb72
2019-10-31 11:22:20 -07:00
Ashwini Oruganti
16659c5ab0
Merge "Add keys for GooglePermissionController" am: 6aaafc4ad4
...
am: 123ecb97ec
Change-Id: I889a4226362e18d4566db72e15034a477d604b53
2019-10-31 09:54:31 -07:00
Ashwini Oruganti
123ecb97ec
Merge "Add keys for GooglePermissionController"
...
am: 6aaafc4ad4
Change-Id: I4a086c030697f4f71098add5653c71402412bd5f
2019-10-31 09:44:40 -07:00
Ashwini Oruganti
6aaafc4ad4
Merge "Add keys for GooglePermissionController"
2019-10-31 16:38:56 +00:00
Roland Levillain
b353eda0c0
Implement APEX JAR (Java library) absence checks for Core Libraries.
...
Refactor existing native library checks to share common logics.
Test: Check that `m installclean && m systemimage` succeeds
Test: Check that `m installclean && m libart && m systemimage` fails
Test: Check that `m installclean && m core-oj && m systemimage` fails
Test: Check that `m installclean && m conscrypt && m systemimage` fails
Test: Check that `m installclean && m libart core-oj conscrypt && m systemimage` fails
Test: Check that
`export OVERRIDE_TARGET_FLATTEN_APEX=true \
&& m installclean \
&& m systemimage`
succeeds
Bug: 142944799
Bug: 128708192
Bug: 113374338
Change-Id: I703a837c6bb138af73eeb95fc08e1a87af2d8ad7
2019-10-31 16:09:02 +00:00
Roland Levillain
a3f6fa20aa
Merge "Reland "Remove Core Library JARs from `/system/framework`."" am: 3596fc60c8
...
am: 6dc4d94f1f
Change-Id: I798e74483ad1cf7d85c218e6b184f93f68b04129
2019-10-31 06:28:17 -07:00
Roland Levillain
6dc4d94f1f
Merge "Reland "Remove Core Library JARs from `/system/framework`.""
...
am: 3596fc60c8
Change-Id: I08d2921b9111051e2fbb1283c1604aba57c1d432
2019-10-31 06:22:22 -07:00
Roland Levillain
3596fc60c8
Merge "Reland "Remove Core Library JARs from `/system/framework`.""
2019-10-31 13:07:46 +00:00
Yo Chiang
6276066a02
Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI
...
Bug: 141972143
Test: lunch mainline_system_arm64-userdebug ; m
Test: TH build_test
Merged-In: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
Change-Id: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
2019-10-31 11:00:28 +00:00
Yo Chiang
8c1290cbd5
Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI
...
Bug: 141972143
Test: lunch mainline_system_arm64-userdebug ; m
Test: TH build_test
Merged-In: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
Change-Id: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
2019-10-31 10:56:49 +00:00
Orion Hodson
e9b354af19
Merge "Update finding go files" am: aff6c12f10
...
am: d607b4581a
Change-Id: I2ff9c0438b298c4dc3082ba28c554378a5c3bb76
2019-10-31 01:44:47 -07:00
Orion Hodson
d607b4581a
Merge "Update finding go files"
...
am: aff6c12f10
Change-Id: Ide3e0dca20f89621e03cde2afb25960b25f3d1ce
2019-10-31 01:38:46 -07:00
Treehugger Robot
aff6c12f10
Merge "Update finding go files"
2019-10-31 08:19:35 +00:00
Baligh Uddin
b8fdffb24c
[automerger skipped] Add aapt2 to otatools.zip
...
am: 0bc382e4a7
-s ours
am skip reason: change_id Ib3a4740506f29ebab6930767f2aa8a0b5c4ba053 with SHA1 0f12536e6b
is in history
Change-Id: I0ad936109ce1533278fd3e81ea1406052784b860
2019-10-30 22:11:11 -07:00
Jooyung Han
037b3e081c
Use MakeVar from soong instead of hardcoding
...
check-vndk-list target reads the vndk.libraries.txt file from
SOONG_VNDK_LIBRARIES_FILE makevar.
Bug: 142963962
Test: m check-vndk-list
Change-Id: I10f6ad80757ed267b66c9a709b75621e063f3744
2019-10-31 11:37:07 +09:00
Baligh Uddin
0bc382e4a7
Add aapt2 to otatools.zip
...
Change-Id: I512fcff080b913170f5b1ff84053d31ca4735fa7
Merged-In: Ib3a4740506f29ebab6930767f2aa8a0b5c4ba053
2019-10-30 14:26:43 -07:00
Dan Willemsen
67074fec61
Update the docs for 'mm[m][a]'
...
Make it explicit that we will build *and* install all the modules under
the directories. And that 'mm[m]' is now the same as 'mm[m][a]'.
Test: hmm
Change-Id: I86c42229f8cdc24922fb3014777ad13d72a1c0ea
2019-10-30 12:35:34 -07:00
Xin Li
5cf7c45d0c
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
Bug: 142003500
Change-Id: I635cde495c56988d324aeab6a278f4abfdea16d8
2019-10-30 11:46:29 -07:00
Roland Levillain
c7c4a766f0
Reland "Remove Core Library JARs from `/system/framework`."
...
These JARs are part of the ART APEX, and are now located in
`/apex/com.android.art/javalib`. Remove the supernumerary copies in
`/system/framework` and save ~11 MiB on the system partition.
This change no longer breaks coverage builds, as module
`jacocoagent` has been removed from `TARGET_CORE_JARS` in CL
https://android-review.googlesource.com/c/platform/build/+/1151464 .
This reverts commit 7c39368927
.
Test: Device boot test
Test: Check that:
export EMMA_INSTRUMENT=true
&& unset EMMA_INSTRUMENT_STATIC
&& m installclean
&& m systemimage
generates a system image that contains these files:
/system/framework/apex-jacocoagent.vdex
/system/framework/boot-jacocoagent.vdex
/system/framework/jacocoagent.jar
/system/framework/<arch>/apex-jacocoagent.art
/system/framework/<arch>/apex-jacocoagent.oat
/system/framework/<arch>/apex-jacocoagent.vdex
/system/framework/<arch>/boot-jacocoagent.art
/system/framework/<arch>/boot-jacocoagent.oat
/system/framework/<arch>/boot-jacocoagent.vdex
Test: Run test ATP test avd/avd_boot_health_check on build target
cf_x86_phone-userdebug_coverage
Bug: 142944799
Bug: 143304991
Change-Id: Ifdb2331c5dcb992adbfd6c5a3983d8b9b13d16b2
2019-10-30 16:25:19 +00:00
Anton Hansson
cca8cdb993
Ensure current product use PRODUCT_* vars directly
...
Disallow use of the long-form PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_*
after the short-form has been assigned, to ensure modifications are
made to the right variable.
Macros that need to work with multiple products get a convenience
macro that is redefined at the right moment.
Test: compare_target_files
Test: build_test
Change-Id: Ib0e57b1bc51b1f308296a150b9b7590a0bb5c313
2019-10-30 14:29:42 +00:00
Bo Hu
dac4bb3700
Merge "emulator: remove vintf and some whitelists" am: 3c9230183d
...
am: 4febe1e5b3
Change-Id: Id4b86c7244d30e7f64861c787cd38d1f43457167
2019-10-30 07:14:13 -07:00
Bo Hu
4febe1e5b3
Merge "emulator: remove vintf and some whitelists"
...
am: 3c9230183d
Change-Id: I8d75453751aa9a41e3cca21eafcbea58e6767aa5
2019-10-30 07:08:14 -07:00
Bo Hu
3c9230183d
Merge "emulator: remove vintf and some whitelists"
2019-10-30 13:20:19 +00:00
Roland Levillain
e4516b7406
Merge "Remove module `jacocoagent` from `TARGET_CORE_JARS`." am: 10954b52ee
...
am: 8262feccd9
Change-Id: I8c68f1db656aee6fc7942ccd696f6f25e3bdf242
2019-10-30 04:33:23 -07:00
Roland Levillain
8262feccd9
Merge "Remove module `jacocoagent` from `TARGET_CORE_JARS`."
...
am: 10954b52ee
Change-Id: I25003eca86e455f9193278cfdc408db0e39a9d01
2019-10-30 04:27:13 -07:00
Roland Levillain
10954b52ee
Merge "Remove module `jacocoagent` from `TARGET_CORE_JARS`."
2019-10-30 11:08:12 +00:00
Orion Hodson
831472dee1
Update finding go files
...
Add gogrep for grepping golang files.
Extend mgrep to search for files in subfolders of build and soong
directories.
Test: source build/envsetup.sh && gogrep DepsMutators
Test: source build/envsetup.sh && mgrep ProductPrivateSepolicyDirs
Change-Id: I26fd9ba5ba0b81b202154aa527ed4a0aa60c1c54
2019-10-30 10:07:17 +00:00
Jooyung Han
a5b494576c
Merge "CleanSpec for VNDK APEX" am: 1be2490d3b
...
am: 30d0d7640e
Change-Id: Iaeab2aaf33a49bf765e0eda1e0271d57a82a71fc
2019-10-29 21:44:05 -07:00
Jooyung Han
e059bdeb0b
Merge "Revert "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs""""" am: 85808a8089
...
am: f889ac5e21
Change-Id: I793657fd68426f86cfb8e2f5d60e58b3ccf66d6d
2019-10-29 21:43:59 -07:00
Jooyung Han
30d0d7640e
Merge "CleanSpec for VNDK APEX"
...
am: 1be2490d3b
Change-Id: Ib5b53fe4f6368dff52207952cf38b2dd7d533dae
2019-10-29 21:37:39 -07:00