aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-08-09Snap for 10635039 from fd9d4c915779907b71ab5c7d0f95d8e08af6959b to ↵android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseAndroid Build Coastguard Worker
udc-qpr1-release Change-Id: I9a531797b4405445587292669c47c95ad5e958fc
2023-08-09Merge changes from topic "kotlinx.coroutines-udc-qpr-dev" into udc-qpr-devJordan Demeulenaere
* changes: Merge META-INF/services/* files in merge_zips -jar Strip META-INF/services from implementation jars when using as header jars
2023-08-03Snap for 10607267 from 042235b1a9500f33a2cc0b11eb32dbef824e0758 to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: Ie736de204c6cdc14439cc68e25ce661c176eb030
2023-08-02Add libdumpstateutil to vendor variant list am: 6e0dbf887eKevin Jeon
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24286944 Change-Id: Ib40a6434b4331227f7bd52c316d2cb616b637eae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01Add libdumpstateutil to vendor variant listKevin Jeon
This change adds libdumpstateutil to VndkMustUseVendorVariantList. This is done to avoid a VNDK re-spin on aosp/2679475 and aosp/2681060, which add the dumpstate util function IsStrictRun and make it framework-only. Test: Presubmit; verify that builds still work on internal (refer to aosp/2681060 test). Ignore-AOSP-First: This is already in AOSP, but needs to be cherry-picked here first before being removed from AOSP. Bug: 283326935 Change-Id: I3c60dd919a65182937d6e0b233635ff6ca9414d3
2023-07-26Merge META-INF/services/* files in merge_zips -jarColin Cross
kotlinx_coroutines_test and kotlinx_coroutine_android each provide a META-INF/services/kotlinx.coroutines.CoroutineExceptionHandler with different contents, and the final contents needs to be the combination of the two files. Implement service merging in merge_zips when the -jar argument is provided. Bug: 290933559 Test: TestMergeZips Change-Id: I69f80d1265c64c671d308ef4cdccfa1564abe056 Merged-In: I69f80d1265c64c671d308ef4cdccfa1564abe056 (cherry picked from commit 7592d5a0bdec6848b1679eb29a28eb8dddfe4c87)
2023-07-26Strip META-INF/services from implementation jars when using as header jarsColin Cross
If a header jar couldn't be built (for example when an API generating annoation processor is in use) the implementation jar is reused as the header jar. If the implementation jar contains an annotation processor listed in META-INF/services/javax.annotation.processing.Processor then later javac executions with the implementation jar in the classpath could attempt to run the annotation processors unexpectedly. Remove the META-INF/services directory when using an implementation jar as a header jar. Bug: 290933559 Test: builds Change-Id: I40d48644bc5a09a9564dc2c4b38f627edd00fcf8 Merged-In: I40d48644bc5a09a9564dc2c4b38f627edd00fcf8 (cherry picked from commit f06d8dc8e3816cef2d3c0ba072ad1fc24bc44de0)
2023-07-18Snap for 10515480 from 48961660e51b47550a0601d40a0df0ebba8feea3 to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: I01830c1731f3ed8c1410709438218c285d8f6db5
2023-07-17Install sdk variants in unbundled builds and package uninstallable variants ↵Colin Cross
am: 3d6f3a02f8 am: 46021831fb Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24086298 Change-Id: I816de606ea7d06e99e8b078a1c5d98c64a8d0d1f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17Install sdk variants in unbundled builds and package uninstallable variants ↵Colin Cross
am: 3d6f3a02f8 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24086298 Change-Id: I71e22b1d4b847d09b3dc88ddc6abd3d267732645 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Install sdk variants in unbundled builds and package uninstallable variantsColin Cross
This effectively undoes both If6c3ee82d588e2742c85cef7244c090c93f38b8e and I682e4f1f477f3024f7719dfaa67006ef335e0640. SDK variants are now installed again, which will fix unbundled builds of cc_test modules. The platform variants used by com.android.virt are now packagable even though they are not installable. Fix the original problem in b/194403710 by adding a flag to platform variants of modules in apexes that are not platform available, and using that to prevent install and packaging dependencies. That allows the HideFromMake flag to go back to being used for preventing install dependencies but not packaging dependencies. Test: TestPackagingWithSkipInstallDeps Test: TestFileSystemShouldInstallCoreVariantIfTargetBuildAppsIsSet Test: TestFileSystemShouldSkipApexLibraries Bug: 194403710 Bug: 268582372 Fixes: 274443025 Bug: 274028926 Change-Id: If5418df3ddbb940bd631caebdf38daa81e71f40e Merged-In: If5418df3ddbb940bd631caebdf38daa81e71f40e (cherry picked from commit bd3a16b5e75e15d91d6a8cb16ccc53d9d8e202a6)
2023-07-13Snap for 10492621 from 2a26406e901751e6259b23872ba099a3b4d0b0d8 to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: If519fe71883e3ceebea6fd9af2c3280dee319ff4
2023-07-13Add integration test for m build SBOM of APEXs/APKs. am: b68bfc65d8 am: ↵Wei Li
8383e68d89 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24029573 Change-Id: I38ea614f2ea5e643d4f8e643a2a3ea022a1ba1dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Cleanup SBOM test script for later adding tests of generating SBOM of am: ↵Wei Li
1b2badc435 am: 7bfbf440e5 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24029572 Change-Id: I9eea63cdebdeffa30ee7ab147ec73002fb263f42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Exclude diffs caught by sbom_test. am: 92275ff913 am: a177c490ebWei Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24029571 Change-Id: I97daf0e816180462d4d592b1c3f9ac61209efdd8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Add integration test for m build SBOM of APEXs/APKs. am: b68bfc65d8Wei Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24029573 Change-Id: Ibffb690efae783717405b4d6178b88aab589fbfc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Cleanup SBOM test script for later adding tests of generating SBOM of am: ↵Wei Li
1b2badc435 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24029572 Change-Id: I2b23257042a0f0c61c22a7a6bf5073d67fc5b3b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Exclude diffs caught by sbom_test. am: 92275ff913Wei Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24029571 Change-Id: I8c34f05511760401cec77bc7939f5a240130e1c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Add integration test for m build SBOM of APEXs/APKs.Wei Li
Bug: 266726655 Test: build/soong/tests/sbom_test.sh (cherry picked from https://android-review.googlesource.com/q/commit:59df0ee44206557cbe18ce42117b201f4d858bee) Merged-In: Id8002042f607f8e158f561ca47e0a84a8b8927e2 Change-Id: Id8002042f607f8e158f561ca47e0a84a8b8927e2
2023-07-11Cleanup SBOM test script for later adding tests of generating SBOM ofWei Li
unbundled APKs/APEXs. Bug: 266726655 Test: build/soong/tests/sbom_test.sh (cherry picked from https://android-review.googlesource.com/q/commit:cd9948f66e9686e83cbe86d2b8ee998564caff0f) Merged-In: I2bb3e8405dad716837d3004d4c6fd54ae80527c1 Change-Id: I2bb3e8405dad716837d3004d4c6fd54ae80527c1
2023-07-11Exclude diffs caught by sbom_test.Wei Li
Bug: 284279034 Test: build/soong/tests/sbom_test.sh (cherry picked from https://android-review.googlesource.com/q/commit:704146094a262f1f7e99ee8606469834ec142a34) Merged-In: I152c2e2c55b6547b2dddf7b1b2524681c9af952e Change-Id: I152c2e2c55b6547b2dddf7b1b2524681c9af952e
2023-07-08Snap for 10459084 from d0c868eb993378665b60fc7c86986e1adb242fcd to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: I44e3a6c0d1af152644dbc55b98bd72427b3b0991
2023-07-07[automerger skipped] Merge changes from topics ↵Jiyong Park
"presubmit-am-4cd8cd324e7e4d359a3ec54800a0c725", "presubmit-am-724cd6e390214cefa6370a38673590b7" into tm-mainline-prod am: 4d756e60c9 -s ours am: 93addffa5c -s ours am: e9eebc3d96 -s ours am skip reason: Merged-In I1010ec66d8551fcc1e2d9119be7ecdba22186607 with SHA-1 4169a25f54 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22727406 Change-Id: I9b74cb557675eb4aaba2ea0525aa6779d8f7b500 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07[automerger skipped] Put base APK when AppSet is included in APEX am: ↵Jiyong Park
e7cc3513f8 -s ours am: 5227ef017c -s ours am: b7554dee19 -s ours am skip reason: Merged-In I1010ec66d8551fcc1e2d9119be7ecdba22186607 with SHA-1 4169a25f54 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22727406 Change-Id: If861ff4632f7da6d899929f046bbaf38c4698e56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07[automerger skipped] Merge changes from topics ↵Jiyong Park
"presubmit-am-4cd8cd324e7e4d359a3ec54800a0c725", "presubmit-am-724cd6e390214cefa6370a38673590b7" into tm-mainline-prod am: 4d756e60c9 -s ours am: 93addffa5c -s ours am skip reason: Merged-In I1010ec66d8551fcc1e2d9119be7ecdba22186607 with SHA-1 4169a25f54 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22727406 Change-Id: I41c1ba434a6368126f0ed3ba662a1f8524e672e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07[automerger skipped] Put base APK when AppSet is included in APEX am: ↵Jiyong Park
e7cc3513f8 -s ours am: 5227ef017c -s ours am skip reason: Merged-In I1010ec66d8551fcc1e2d9119be7ecdba22186607 with SHA-1 4169a25f54 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22727406 Change-Id: I2eab3276f092c025120eaf927cc363f95256e346 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07[automerger skipped] Merge changes from topics ↵Jiyong Park
"presubmit-am-4cd8cd324e7e4d359a3ec54800a0c725", "presubmit-am-724cd6e390214cefa6370a38673590b7" into tm-mainline-prod am: 4d756e60c9 -s ours am skip reason: Merged-In I1010ec66d8551fcc1e2d9119be7ecdba22186607 with SHA-1 4169a25f54 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22727406 Change-Id: I21e9305edec6e07a3d3428e2dda263de47517cad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07[automerger skipped] Put base APK when AppSet is included in APEX am: ↵Jiyong Park
e7cc3513f8 -s ours am skip reason: Merged-In I1010ec66d8551fcc1e2d9119be7ecdba22186607 with SHA-1 4169a25f54 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22727406 Change-Id: Ia51161661a618dcb9d269903da37c82b84911f3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07Merge changes from topics "presubmit-am-4cd8cd324e7e4d359a3ec54800a0c725", ↵Jiyong Park
"presubmit-am-724cd6e390214cefa6370a38673590b7" into tm-mainline-prod * changes: Put base APK when AppSet is included in APEX Use PackedAdditionalOutputs when reading apk_set for canned_fs_config
2023-07-06Snap for 10449897 from c5c5d38eb09ef0bf7aaabc44ab297fede75942ea to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: Ie1cbac565731730dcae4c6074d84fa4b3724c03c
2023-07-05don't export systemserverclasspath_fragment if contents are empty am: ↵Sam Delmerico
754b054d63 am: 2444e2dd66 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23903886 Change-Id: I5baf130d7e6be34ab5ba3ab8de4d4b4de1ea3983 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05don't export systemserverclasspath_fragment if contents are empty am: 754b054d63Sam Delmerico
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23903886 Change-Id: If8c891e11ce7d40336bd2f9ad255c3c9dd1bd613 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05don't export systemserverclasspath_fragment if contents are emptySam Delmerico
If a systemserverclasspath_fragment only contains libraries that have a higher min_sdk_version than the target build release version, then we should not export the systemserverclasspath_fragment. Before this change, the fragment was exported with an empty `contents` property which caused errors after being dropped as a prebuilt. Bug: 289183551 Test: go test ./sdk (cherry picked from https://android-review.googlesource.com/q/commit:35881365b49235b2311f48bfcbaff8f873f19b88) Merged-In: Ifefc6880228e4dd37f5e42b2bda31a83df785375 Change-Id: Ifefc6880228e4dd37f5e42b2bda31a83df785375
2023-06-28Snap for 10402374 from 177496ca6b64d0dba467c7c2d6fd603e81f5fec4 to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: Iaf0a5c1c874b25d28cc297ca33acfcdeb839021f
2023-06-28[automerger skipped] DO NOT MERGE Increasing the dev branch default module ↵Alexei Nicoara
version am: 373e894e3c -s ours am: d5ce519031 -s ours am skip reason: Merged-In Iad9079f026f46da35f36723937db9bf5771580d1 with SHA-1 1240f28d09 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23830108 Change-Id: I465f40b958763dda92835f0aaba12f929c34693d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28[automerger skipped] DO NOT MERGE Increasing the dev branch default module ↵Alexei Nicoara
version am: 373e894e3c -s ours am skip reason: Merged-In Iad9079f026f46da35f36723937db9bf5771580d1 with SHA-1 1240f28d09 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23830108 Change-Id: I2fbe4051e5e8309e530ca92531c663fa56bac6ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27DO NOT MERGE Increasing the dev branch default module versionAlexei Nicoara
After the prebuilt drop the modules under test in udc-dev can not be installed anymore because their version is lower than the prebuilt version. Increasing the version so the modules built from source would have a higher version. Bug: 288871663 Change-Id: If5cfd3ec62860a6f26bdd87ee6c77248c2bea0fb Ignore-AOSP-First: change needed on udc-dev only Merged-In: Iad9079f026f46da35f36723937db9bf5771580d1
2023-06-16Snap for 10330433 from f1964b5b67c78244abe1f78f72f5d8d40ba404c3 to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: I477152a2a8ecd566658a1eff51e54f7b7cdb1084
2023-06-14[automerger skipped] DO NOT MERGE Add genrule to build *.latest.version ↵Gurpreet Singh
build target. am: 8a7dad00c2 -s ours am: 207a631f9c -s ours am: 61636530ce -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23638331 Change-Id: Id1a82246c4a60e0c858ce0200b69f3629e478ad6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14[automerger skipped] DO NOT MERGE Add genrule to build *.latest.version ↵Gurpreet Singh
build target. am: 8a7dad00c2 -s ours am: 207a631f9c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23638331 Change-Id: I838aed06dc6245a3b66fe842626ad74032ad0bbd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14[automerger skipped] DO NOT MERGE Add genrule to build *.latest.version ↵Gurpreet Singh
build target. am: 8a7dad00c2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23638331 Change-Id: I5d87e013957af1cb79476a1e4cf291e3281485bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14DO NOT MERGE Add genrule to build *.latest.version build target.Gurpreet Singh
Build a new target *.latest.version which will contain a text file containing the last finalized version. Bug: 242316893 Test: atest prebuilt_apis_test (cherry picked from https://android-review.googlesource.com/q/commit:daa314ac97d5ab8076113ee7f269b4e4cc3cf620) Merged-In: I41fa91c9ec273f342b7807c66c4d65ba13260124 Change-Id: I41fa91c9ec273f342b7807c66c4d65ba13260124
2023-06-08Snap for 10277391 from ccb228c33c05e4ef37e64580c5e7bfa1dacaec8d to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: Ieb50aeefbab21789bde05c9a611ebfc4eb25340b
2023-06-07afdo: Remove -fprofile-sample-accurate flag am: 9825a6c7f8 am: ac03dfab7fYi Kong
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23587699 Change-Id: I037f3b3ce208ee9f885bb012d14c244d08077e14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07afdo: Remove -fprofile-sample-accurate flag am: 9825a6c7f8Yi Kong
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23587699 Change-Id: Id63a967929a850a8b5c8fa7725b3fc7fbdeffb41 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06afdo: Remove -fprofile-sample-accurate flagYi Kong
-fprofile-sample-accurate allows the compiler to de-optimize cold code paths according to the profile. However we have a number of micro- benchmarks that tests these paths and we often trigger regression reports from those benchmarks. Turning off the flag mitigates the issue at a cost of ~2MB increase in system image size. But the more deterministic codegen could reduce the differential OTA size. Test: presubmit Bug: 283235002 (cherry picked from https://android-review.googlesource.com/q/commit:febf8b9bdf40b086a50930901a7ccfaaa628bcba) Merged-In: I1016f573f21a60223a97c64f5818f0e7e66e41e3 Change-Id: I1016f573f21a60223a97c64f5818f0e7e66e41e3
2023-05-25Snap for 10196038 from bebdce680d74df68d05718c46ee216ca6c430da9 to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: I9003ad6d0f0fc4a1196d28d31285689f97f57dab
2023-05-24Merge "Revert "Revert "mixed builds correctly reference stubs libs""" into ↵Yu Liu
udc-dev am: 98f13dd1a0 am: cd941e2b60 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374491 Change-Id: I68a6f2c68495176b4c88f086b866f664d69db44a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24Merge "Fix a bug where CppFlags should have been Cppflags" into udc-dev am: ↵Yu Liu
2b9f3f983b am: a62b5cdc1a Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23353145 Change-Id: I59f599e8716b22ed34ee91a395589da29d23d25b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24Merge "Revert "Revert "mixed builds correctly reference stubs libs""" into ↵Yu Liu
udc-dev am: 98f13dd1a0 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374491 Change-Id: I3dfa962e2be4f44aa0863867d026fbaeec58b790 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 15:14:22 +0000