summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-05-12Dexpreopt ART jars and framework jars together. am: 5f5a17fd6b am: a0a45671a6 Jiakai Zhang
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208462 Change-Id: I28df1bfaa1bea200204c6efa930c3cee4175c72f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Unify installDirOnHost and installDirOnDevice. am: 7ba1ca0ac3 am: b98da74c1b Jiakai Zhang
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208461 Change-Id: I5a9aa7159ac2ea5b414216926d889599ee33905d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Remove the ability to install boot images by bootclasspath_fragments. am: ↵ Jiakai Zhang
4e9eb1ae46 am: 1e73815c3f Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208460 Change-Id: I0034742093b2a9d502eb106f010ad83dd6dc2d49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Prepare tests for dexpreopt changes. am: c67528bf7e am: b0b019ed36 Jiakai Zhang
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23206714 Change-Id: I8c02372ecaab2eb372bd46e5e402380abbbdb4a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Get rid of DeviceName() from path related to dexpreopt am: bc9256b531 am: ↵ Jeongik Cha
6eea4a6967 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208459 Change-Id: I6049f607f6cf24e0c9e2bc0942b886aa681a11ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Dexpreopt ART jars and framework jars together. am: 5f5a17fd6b Jiakai Zhang
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208462 Change-Id: I1c51c5e667a485e3f2780354e4036990256d80e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Unify installDirOnHost and installDirOnDevice. am: 7ba1ca0ac3 Jiakai Zhang
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208461 Change-Id: Ib274dc7a928b6afbabbf20eec30943580609c1d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Remove the ability to install boot images by bootclasspath_fragments. am: ↵ Jiakai Zhang
4e9eb1ae46 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208460 Change-Id: I5f7d93bf29490f918a1242f17fdbf42a1babc2c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Prepare tests for dexpreopt changes. am: c67528bf7e Jiakai Zhang
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23206714 Change-Id: I03f2d2e43c613e25544710a604a51556f4ae9289 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Get rid of DeviceName() from path related to dexpreopt am: bc9256b531 Jeongik Cha
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208459 Change-Id: Id897907cf9353f4b90d7439fdd7851755221a334 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Dexpreopt ART jars and framework jars together. Jiakai Zhang
Bug: 280776428 Test: atest art_standalone_dexpreopt_tests Test: - 1. m 2. Check .invocation file (http://gpaste/6498044089466880) 3. Check files in $ANDROID_PRODUCT_OUT/system/framework/x86_64 Test: - 1. m dist 2. Check files in out/dist/boot.zip Test: - 1. art/tools/buildbot-build.sh --host 2. m test-art-host-gtest 3. art/test/testrunner/testrunner.py --host Test: m build-art-target-golem (cherry picked from https://android-review.googlesource.com/q/commit:c08c162b5a82ddfc44e9944d798636b2241308de) Merged-In: I89490252e56a05edab03fdddc6539fa4d7f79756 Change-Id: I89490252e56a05edab03fdddc6539fa4d7f79756
2023-05-12Unify installDirOnHost and installDirOnDevice. Jiakai Zhang
These two fields never do what they are described to do. This CL unifies them to avoid the confusion. Bug: 280440941 Test: m (cherry picked from https://android-review.googlesource.com/q/commit:09d88df0407263e846b01c226184b262f2e36678) Merged-In: I3652d73a50832a2e494d9f5cae750f5fc38293b4 Change-Id: I3652d73a50832a2e494d9f5cae750f5fc38293b4
2023-05-12Remove the ability to install boot images by bootclasspath_fragments. Jiakai Zhang
We don't need this anymore because we are going to compile ART jars and framework jars together. Bug: 280776428 Test: m (cherry picked from https://android-review.googlesource.com/q/commit:b47caccbc037b65462f757c462a99732ad6dd51c) Merged-In: I070157530449a1bb5779e25984c367df3dde7b36 Change-Id: I070157530449a1bb5779e25984c367df3dde7b36
2023-05-12Prepare tests for dexpreopt changes. Jiakai Zhang
After this change, there is a clear separation between tests that are related to dexpreopt and tests that are not. The former uses PrepareForTestWithDexpreopt, while the latter uses PrepareForTestWithJavaDefaultModules. The benefit is that the latter will no longer affected by any dexpreopt changes. Bug: 280776428 Test: m nothing (cherry picked from https://android-review.googlesource.com/q/commit:b95998be731406209f18fab764b96421a17ab4c9) Merged-In: Ib957765b9287d51c082e0a33cee17a6bb56daeef Change-Id: Ib957765b9287d51c082e0a33cee17a6bb56daeef
2023-05-12Get rid of DeviceName() from path related to dexpreopt Jeongik Cha
As-is, dexpreopt config and bootjar is in the dir including DeviceName(). It causes unnecessary dexpreopt invocation when target is changed repeatly. To avoid it, rename dir to common name. Bug: 278833696 Test: m (cherry picked from https://android-review.googlesource.com/q/commit:4753b39ccaaf573910e6b7a4200e9ca03ec8d96d) Merged-In: I2818d9ae09e6c22ca6989cc8efdb70b470ec502c Change-Id: I2818d9ae09e6c22ca6989cc8efdb70b470ec502c
2023-05-10Merge changes from topic ↵ Jiakai Zhang
"cherrypicker-L72800000960451564:N93200001365390015" into udc-dev am: 51babf3c4c am: 871f1fde94 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23043873 Change-Id: I1f2302eb176f2fa8f3f5c71653691d3ed9bd07e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10Generate boot image profiles even if dexpreopt is disabled. am: 1d99986d30 ↵ Jiakai Zhang
am: 2145d52876 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23043872 Change-Id: Ibd294a9a26345f19f956667ad0845c7f76a359e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10Merge changes from topic ↵ Jiakai Zhang
"cherrypicker-L72800000960451564:N93200001365390015" into udc-dev am: 51babf3c4c Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23043873 Change-Id: I1129511345db326db6a3ba423bd5e25851871807 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10Generate boot image profiles even if dexpreopt is disabled. am: 1d99986d30 Jiakai Zhang
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23043872 Change-Id: I6c846ff536cdebf6d30634f686a09be1703aef23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10Merge changes from topic ↵ Jiakai Zhang
"cherrypicker-L72800000960451564:N93200001365390015" into udc-dev * changes: Generate app profiles even if dexpreopt is disabled. Generate boot image profiles even if dexpreopt is disabled.
2023-05-10Merge "VSDK: use relative install path when generating snapshots" into ↵ Treehugger Robot
udc-dev am: 1dd392b123 am: 4ff1445085 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22980276 Change-Id: I498a7c50640aaad01bf20058444262e94f524ff7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10APEX can use any Prebuilt libraries am: 6bd266b3ec am: 996a4a5007 Justin Yun
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23101375 Change-Id: Ic0a6c17f5836cf5f3770fa1aebacf806aef25967 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10Mark LLNDK prebuilts as LLNDK am: c21c1e4dbf am: 5dced78984 Jooyung Han
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23101374 Change-Id: I3956e66af9daf0d927886aa9ee0c783d995e58bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10Merge "VSDK: use relative install path when generating snapshots" into ↵ Treehugger Robot
udc-dev am: 1dd392b123 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22980276 Change-Id: I3b7bac6b4f4d5c3baea59fc7e9a3d556f55e4ef1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10APEX can use any Prebuilt libraries am: 6bd266b3ec Justin Yun
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23101375 Change-Id: Id7b291b3de949c0cb786e3c3c15bd73051df7351 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10Mark LLNDK prebuilts as LLNDK am: c21c1e4dbf Jooyung Han
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23101374 Change-Id: I92683fa8fcc307f56c66e114d562c83968fd1542 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10Merge "VSDK: use relative install path when generating snapshots" into udc-dev Treehugger Robot
2023-05-09Generate app profiles even if dexpreopt is disabled. Jiakai Zhang
Bug: 280440941 Test: - 1. Patch ag/22302622 to disable dexpreopt. 2. lunch aosp_cf_x86_64_phone-userdebug && m 3. See app profiles still generated. Test: - 1. Patch ag/20592051 to enable profile for service-art. 2. banchan com.android.art x86_64 && m 3. See the profile for service-art generated. (cherry picked from https://android-review.googlesource.com/q/commit:cf61e3c59133227894ac7d72091b48451a3e6761) Merged-In: I6090b4b74cedb6d129fcbeef58d075c8ccdcc4e2 Change-Id: I4e721b475b84a2f667bbccc030a8947078f26bb0
2023-05-09Generate boot image profiles even if dexpreopt is disabled. Jiakai Zhang
Bug: 280440941 Test: - 1. Patch ag/22302622 to disable dexpreopt. 2. See boot image profiles still generated. (cherry picked from https://android-review.googlesource.com/q/commit:bc698cd28aa2ee17af208bfd56f003347116ddb0) Merged-In: I5f7f746ca1d4da660fe0c40115e6c71750dfdccc Change-Id: I1bf05ade53fa83f3dba46f28a8f9246ba1fdf664
2023-05-09APEX can use any Prebuilt libraries Justin Yun
Vendor snapshot libraries generated from prebuilt libraries set "apex_inherit" to their min_sdk_version property to allow them to be used by vendor APEXes. Bug: 277403349 Test: m vendor-snapshot Merged-In: Idd9e5f8e94b3fa2adf47a04507bf0c50c59edfb7 Change-Id: Idd9e5f8e94b3fa2adf47a04507bf0c50c59edfb7 (cherry picked from commit 3cc7846b5887c130ba5ccb5a8f77d8a1a7358ab2)
2023-05-09Mark LLNDK prebuilts as LLNDK Jooyung Han
so that Vendor APEXes don't embed the LLNDK prebuilts (which are just stubs of LLNDK libraries). Bug: 280697209 Bug: 277403349 Test: m nothing (soong test) Merged-In: I9e6c123e73fa0ab56d8494a01652ee32a9b6a6cd Change-Id: I9e6c123e73fa0ab56d8494a01652ee32a9b6a6cd (cherry picked from commit e3f0281b8897da1fe23b2f4f3a05f1dc87bcc902)
2023-05-03Merge "Enable HWASan for multiple modules in one place(Soong)" into udc-dev ↵ Treehugger Robot
am: 70811b4030 am: c8692ef263 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22953989 Change-Id: I9cb8c3629970cf7a6e0f353c05a3a3fe193e0fe6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03Merge "Enable HWASan for multiple modules in one place(Soong)" into udc-dev ↵ Treehugger Robot
am: 70811b4030 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22953989 Change-Id: I282c3e3d1614ed68052775a98c41537c60e863ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03Merge "Enable HWASan for multiple modules in one place(Soong)" into udc-dev Treehugger Robot
2023-05-03Merge "Revert "DO NOT MERGE: Changing the udc-dev version to 345990000"" ↵ Alexei Nicoara
into udc-dev am: eb6c2a2fba am: 1ed9db1ba9 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22994519 Change-Id: Ia6572f488c325ed66a7de63d0d8431b21cf9a815 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03Revert "DO NOT MERGE: Changing the udc-dev version to 345990000" am: ↵ Alexei Nicoara
1240f28d09 am: d9cc1b9be9 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22994519 Change-Id: I8112295ce58fcff1d6a9a717935590b7ee1f0c1f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03Merge "Revert "DO NOT MERGE: Changing the udc-dev version to 345990000"" ↵ Alexei Nicoara
into udc-dev am: eb6c2a2fba Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22994519 Change-Id: I10bfea26ab7e7d2ec5e44fc103ec74532024385a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03Revert "DO NOT MERGE: Changing the udc-dev version to 345990000" am: 1240f28d09 Alexei Nicoara
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22994519 Change-Id: I5e16ec86573d1cf9a5ce17b38e48f93771f16ee4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03Merge "Revert "DO NOT MERGE: Changing the udc-dev version to 345990000"" ↵ Alexei Nicoara
into udc-dev
2023-05-03Revert "DO NOT MERGE: Changing the udc-dev version to 345990000" Alexei Nicoara
This reverts commit ec0e5a3e9706c8dfbe645d5ed37826f59bae4d89. Reason for revert: b/280553936 Change-Id: Iad9079f026f46da35f36723937db9bf5771580d1
2023-05-03VSDK: use relative install path when generating snapshots Justin Yun
Without respecting the relative install path, the snapshot install path may collide when they use the same stem name. To avoid this, respect the relative install path when generating the snapshots. Bug: 279652606 Test: RECOVERY_SNAPSHOT_VERSION=current m recovery-snapshot Merged-In: Ic70a5855aeb2a6eda397b4dd06113dddb6ef70f4 Change-Id: Ic70a5855aeb2a6eda397b4dd06113dddb6ef70f4 (cherry picked from commit 17d0ee2160e79cc5b30d7b779bc595712125d23b)
2023-05-02Enable HWASan for multiple modules in one place(Soong) Hang Lu
Environment variables HWASAN_INCLUDE_PATHS and PRODUCT_HWASAN_INCLUDE_PATHS can be used to enable HWASan for multiple modules, by just adding the module directory to the env variable. Bug: b/271948407 Test: Set specific module directory to above env variable and check the assembly codes of output elf files after building, finding hwasan related symbols inside. Merged-In: Ic49b515830c4469ca5fa94f547b26c0fb602fc54 Change-Id: Ic49b515830c4469ca5fa94f547b26c0fb602fc54 (cherry picked from commit a98aab98c45aa7245cd235b8822de35aa6eb4fd6)
2023-05-02Merge "16k: Align shared libraries and executables to 4k by default" into ↵ Kalesh Singh
udc-dev am: e03c3bb67c am: 120b63b6f8 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22934316 Change-Id: I951af0ae210526ac80fa963a979d952ec06b7644 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02Merge "16k: Align shared libraries and executables to 4k by default" into ↵ Kalesh Singh
udc-dev am: e03c3bb67c Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22934316 Change-Id: Ifa34e58066b0adc96f831a4baa75342d53a62c60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02Merge "16k: Align shared libraries and executables to 4k by default" into ↵ Kalesh Singh
udc-dev
2023-05-01Merge "target_sdk_version replacement should respect REL branches" into ↵ Treehugger Robot
udc-dev am: e792debb72 am: a841e74d3f Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22942821 Change-Id: Iad3dc0af764df3255a970463e21ed0f963101085 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01Merge "target_sdk_version replacement should respect REL branches" into ↵ Treehugger Robot
udc-dev am: e792debb72 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22942821 Change-Id: I20768cf4f2400717359c193f486d5f3f5aa511ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01Merge "target_sdk_version replacement should respect REL branches" into udc-dev Treehugger Robot
2023-04-29Merge "Add license visibility to prebuilt vsdk" into udc-dev am: 00a3591cc6 ↵ TreeHugger Robot
am: d3be0f7b21 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22903780 Change-Id: I5b9d0d3f2cb57271edd58b37403d073e7cae7e6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29Merge "Add license visibility to prebuilt vsdk" into udc-dev am: 00a3591cc6 TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22903780 Change-Id: I955504a8fca5dff2c26723e3227f159301b3ff2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>