Commit graph

79932 commits

Author SHA1 Message Date
Colin Cross
3888f701bf Merge "Don't write transitive dependencies to Android-${TARGET_PRODUCT}.mk" into main am: 556ba81849 am: c65780626c am: bd149b1c8f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842060

Change-Id: I6cbacf8aaaa93a4003d5479ca5408fd47aa02b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 02:10:44 +00:00
Colin Cross
bd149b1c8f Merge "Don't write transitive dependencies to Android-${TARGET_PRODUCT}.mk" into main am: 556ba81849 am: c65780626c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842060

Change-Id: Ie76b0199f2b33c561ea9c840c7f6220ddc5dbd6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 01:30:43 +00:00
Colin Cross
c65780626c Merge "Don't write transitive dependencies to Android-${TARGET_PRODUCT}.mk" into main am: 556ba81849
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842060

Change-Id: I854bc7c67d7d4525fef42b031ad0b9a9c9080643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 01:26:48 +00:00
Colin Cross
556ba81849 Merge "Don't write transitive dependencies to Android-${TARGET_PRODUCT}.mk" into main 2023-11-30 00:41:43 +00:00
Treehugger Robot
6da20d8141 Merge "Support experimental building with OpenJDK 21" into main am: 8f7ee30d21 am: e7555604b4 am: 7633cdbba8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853425

Change-Id: I4428c3dfa946691f981538533ece68221ff04ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:17:59 +00:00
Treehugger Robot
33658590bc Merge "Support experimental building with OpenJDK 21" into main am: 8f7ee30d21 am: 26539fd5e8 am: a334a87934
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853425

Change-Id: Iace8a28440c7ca1d374465b761abeddaa9b16e8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:16:43 +00:00
Treehugger Robot
7633cdbba8 Merge "Support experimental building with OpenJDK 21" into main am: 8f7ee30d21 am: e7555604b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853425

Change-Id: I88385572d3284a30d89ce246743463ca4af2ad99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 21:45:37 +00:00
Treehugger Robot
a334a87934 Merge "Support experimental building with OpenJDK 21" into main am: 8f7ee30d21 am: 26539fd5e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853425

Change-Id: If31d568a11492284a770bfa8fbd31b25b63899b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 21:43:08 +00:00
Treehugger Robot
26539fd5e8 Merge "Support experimental building with OpenJDK 21" into main am: 8f7ee30d21
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853425

Change-Id: I9bcd13d2b770982a638b41cd82284c96e8293186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 21:19:28 +00:00
Treehugger Robot
e7555604b4 Merge "Support experimental building with OpenJDK 21" into main am: 8f7ee30d21
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853425

Change-Id: Ibc822a51e822945bc409e3d8c041b65528e63be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 21:08:17 +00:00
Ramya Subramanian
f9365edac5 Merge "Revert "Enable dex container (DEX v41) for the whole system"" into main am: 29e05d1007 am: 98950d9e60 am: f0852f67b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853365

Change-Id: I5f7dc225e1de9444e7af4b826c43f6c868068192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 20:39:18 +00:00
Ramya Subramanian
1cd12824cd Merge "Revert "Enable dex container (DEX v41) for the whole system"" into main am: 29e05d1007 am: ff5cf349f5 am: cd13382e8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853365

Change-Id: I5067d85629781bad7b08ab795a58f39223138f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 20:38:32 +00:00
Treehugger Robot
fbddbaac15 Merge "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version" into main am: 7d7d94ffd2 am: 0ea94eb46c am: 88cdfd0abe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849969

Change-Id: I48e0f0d6a98b975e8d81beb73a2d4b2aa8606704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 20:37:22 +00:00
Treehugger Robot
277906a767 Merge "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version" into main am: 7d7d94ffd2 am: ee10636fa8 am: 2e5f5ba2a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849969

Change-Id: I653427559c58e27d108dad6428e5379d0eaaa38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 20:36:59 +00:00
Treehugger Robot
8f7ee30d21 Merge "Support experimental building with OpenJDK 21" into main 2023-11-29 20:25:25 +00:00
Ramya Subramanian
f0852f67b0 Merge "Revert "Enable dex container (DEX v41) for the whole system"" into main am: 29e05d1007 am: 98950d9e60
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853365

Change-Id: Ic0ee710309d171101a15440d9c9c1d7b7b561a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 20:23:18 +00:00
Ramya Subramanian
cd13382e8e Merge "Revert "Enable dex container (DEX v41) for the whole system"" into main am: 29e05d1007 am: ff5cf349f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853365

Change-Id: I09dde37478c63ac44bd22d5a928a31ea9dd34913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 20:21:59 +00:00
Treehugger Robot
88cdfd0abe Merge "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version" into main am: 7d7d94ffd2 am: 0ea94eb46c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849969

Change-Id: Ia21ca26ef12a4fc4c6cce26582734328cb8f6c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 20:21:30 +00:00
Treehugger Robot
2e5f5ba2a7 Merge "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version" into main am: 7d7d94ffd2 am: ee10636fa8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849969

Change-Id: Ia7687497012c5f2eb5d0bfdf0d25b31c5acaaedf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 20:03:44 +00:00
Ramya Subramanian
ff5cf349f5 Merge "Revert "Enable dex container (DEX v41) for the whole system"" into main am: 29e05d1007
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853365

Change-Id: Iecfcf43f2809a8249c59adeb8092902152f61b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 19:54:32 +00:00
Treehugger Robot
0ea94eb46c Merge "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version" into main am: 7d7d94ffd2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849969

Change-Id: I155d942be1a665886defb655325e86b659aff823
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 19:52:01 +00:00
Ramya Subramanian
98950d9e60 Merge "Revert "Enable dex container (DEX v41) for the whole system"" into main am: 29e05d1007
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853365

Change-Id: Ifcc6dcdb148e08763fb1917ac888481a1fbe3007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 19:42:24 +00:00
Treehugger Robot
ee10636fa8 Merge "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version" into main am: 7d7d94ffd2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849969

Change-Id: I09572595d3f54c80140c73131be8d74aaf9acd9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 19:41:25 +00:00
Ramya Subramanian
29e05d1007 Merge "Revert "Enable dex container (DEX v41) for the whole system"" into main 2023-11-29 19:38:50 +00:00
Anas Sulaiman
e6d6b62123 Merge "allow specifying remote caching opt for rewrapper" into main am: 80117e6c4f am: 6198399c68 am: bcbad5e2f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2838517

Change-Id: I9c17ebea6a1daa5bbb81a4d8870298b360f8581b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 19:17:13 +00:00
Anas Sulaiman
ea5c7509d2 Merge "allow specifying remote caching opt for rewrapper" into main am: 80117e6c4f am: 7eb74575b5 am: 45cbc5dea1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2838517

Change-Id: Ia0d3b5c647bb081794f83aa268a1615f54368d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 19:16:19 +00:00
Sorin Basca
0760c89882 Support experimental building with OpenJDK 21
Use EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN=true to build with OpenJDK 21
while still targeting java language version 17.

Bug: 313924276
Test: m EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN=true
Change-Id: Idc892bb7519e597f1e280ca0765c1a281bb29955
2023-11-29 19:13:55 +00:00
Anas Sulaiman
bcbad5e2f5 Merge "allow specifying remote caching opt for rewrapper" into main am: 80117e6c4f am: 6198399c68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2838517

Change-Id: I426e67434e88997a84b24c8b8e3f62d32ebb0277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 18:43:23 +00:00
Anas Sulaiman
45cbc5dea1 Merge "allow specifying remote caching opt for rewrapper" into main am: 80117e6c4f am: 7eb74575b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2838517

Change-Id: Ieca37bd1770749e98a2ed85800a129727b612b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 18:42:33 +00:00
Treehugger Robot
7d7d94ffd2 Merge "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version" into main 2023-11-29 18:36:10 +00:00
Ramya Subramanian
432fbfa848 Revert "Enable dex container (DEX v41) for the whole system"
This reverts commit b82a2a278b.

Reason for revert: DroidMonitor: Potential culprit for multiple Module failures on ATH. verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.”.

Change-Id: I3899a45cce259c4ee38572e76f4735eccb3ca66a
2023-11-29 18:34:31 +00:00
Colin Cross
312634eb0f Don't write transitive dependencies to Android-${TARGET_PRODUCT}.mk
Java libraries were writing lists of files that changed whenever
transitive dependencies changed to Android-${TARGET_PRODUCT}.mk, causing
Kati analysis to rerun whenever a dependency was changed in Soong.
In both cases, Make would immediately use the list to write a single
output file.  Write the files in Soong and pass the path to the file
to Make instead, which will both reduce the size of
Android-${TARGET_PRODUCT}.mk and skip Kati analysis more often.

Bug: 309006256
Test: m checkbuild
Change-Id: I5dff16c6fb7cca8c6da927b37c612c7b1d0954e6
2023-11-29 10:31:13 -08:00
Anas Sulaiman
7eb74575b5 Merge "allow specifying remote caching opt for rewrapper" into main am: 80117e6c4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2838517

Change-Id: I3d3a9a4a05d364ac88277e6a0e2e9904c21e467d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 18:07:57 +00:00
Anas Sulaiman
6198399c68 Merge "allow specifying remote caching opt for rewrapper" into main am: 80117e6c4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2838517

Change-Id: I3788c122d306a878746083bb4ad32425f63ed46e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 18:02:40 +00:00
Anas Sulaiman
80117e6c4f Merge "allow specifying remote caching opt for rewrapper" into main 2023-11-29 16:36:21 +00:00
Treehugger Robot
efe237c8bf Merge "Sandbox seller-frontend-service-stub-lite" into main am: 0fd71d0232 am: 739a364308 am: 3fba6018ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847996

Change-Id: I70e4cd4364f59ee7edba6958b5f8827e3f93eade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 15:58:25 +00:00
Treehugger Robot
97d76af6eb Merge "Sandbox seller-frontend-service-stub-lite" into main am: 0fd71d0232 am: 4a8f6e8607 am: ba748e97a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847996

Change-Id: I541a3ba24088d99120584d9be1551100fcbb3982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 15:58:08 +00:00
Treehugger Robot
3fba6018ec Merge "Sandbox seller-frontend-service-stub-lite" into main am: 0fd71d0232 am: 739a364308
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847996

Change-Id: Ieeb827936848d66d4ea00d439aaa62c8ef5d128d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 15:44:34 +00:00
Treehugger Robot
ba748e97a3 Merge "Sandbox seller-frontend-service-stub-lite" into main am: 0fd71d0232 am: 4a8f6e8607
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847996

Change-Id: Ibf6fbfec01a6dad12c22c7442e4d5040050a21dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 15:26:03 +00:00
Treehugger Robot
739a364308 Merge "Sandbox seller-frontend-service-stub-lite" into main am: 0fd71d0232
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847996

Change-Id: Iea1dc42882ea2775b9efa94b66b65aa6ce98432f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 15:07:38 +00:00
Treehugger Robot
4a8f6e8607 Merge "Sandbox seller-frontend-service-stub-lite" into main am: 0fd71d0232
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847996

Change-Id: I592741712dfc44524293d94ef34d7dae85994c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 14:55:33 +00:00
Treehugger Robot
0fd71d0232 Merge "Sandbox seller-frontend-service-stub-lite" into main 2023-11-29 14:20:24 +00:00
Automerger Merge Worker
6088760e67 Merge "Merge "Remove PreoptExtractedApk." into main am: ba45ba5763 am: 36c8b1d229" into udc-qpr-dev-plus-aosp am: c283d0ffa1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848255

Change-Id: I2b381b43b0d062dc740d4edf7f1c9b873c64b718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 11:55:47 +00:00
Jiakai Zhang
6bdb84acd0 Merge "Remove PreoptExtractedApk." into main am: ba45ba5763 am: c6c66b193c am: 0b4994ea92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848255

Change-Id: Ieadc98f5209863d4af8bde5d11018efa4e403779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 11:54:16 +00:00
Rico Wind
acb8643b56 [automerger skipped] Merge "Reapply "Use R8 for resource shrinking"" into main am: 2f6b403ccd am: c761435b78 am: 5e125d2c56 -s ours
am skip reason: Merged-In Ib8a6fb128084e994325b975c46a036cb41494654 with SHA-1 20c2010030 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2846953

Change-Id: Ie8e28be26763241f4a0247797a475d77f98ee8e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 11:54:04 +00:00
Rico Wind
fe3cd8afa0 [automerger skipped] Merge "Reapply "Use R8 for resource shrinking"" into main am: 2f6b403ccd am: 77379a479f am: 629d8aeee8 -s ours
am skip reason: Merged-In Ib8a6fb128084e994325b975c46a036cb41494654 with SHA-1 20c2010030 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2846953

Change-Id: Id3a245c4afef92346edb622ea423205fcbcdda05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 11:53:43 +00:00
Automerger Merge Worker
c283d0ffa1 Merge "Merge "Remove PreoptExtractedApk." into main am: ba45ba5763 am: 36c8b1d229" into udc-qpr-dev-plus-aosp 2023-11-29 11:24:16 +00:00
Jiakai Zhang
0b4994ea92 Merge "Remove PreoptExtractedApk." into main am: ba45ba5763 am: c6c66b193c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848255

Change-Id: I9971ebbb3a4608936238b375e3a6c7d9b1770ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 11:23:26 +00:00
Rico Wind
5e125d2c56 Merge "Reapply "Use R8 for resource shrinking"" into main am: 2f6b403ccd am: c761435b78
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2846953

Change-Id: I12ce4c3e3644eb935b72f8bb03e3008aa6ff6542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 11:23:08 +00:00
Jiakai Zhang
312cb45aa1 Merge "Remove PreoptExtractedApk." into main am: ba45ba5763 am: 36c8b1d229
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848255

Change-Id: I6731e7659dbac6c28637a242805c93ed61348f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 11:22:18 +00:00