David Srbecky
0cc9d2673f
Merge "Revert^2 "Enable dex container (DEX v41) for the whole system"" into main am: 8e1efb7fc5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853426
Change-Id: I9f247846eb500eeee8cadae6e8f6b2cd9dc58aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 23:42:04 +00:00
Yu Liu
01b9a3cfc9
Merge "Add container property to aconfig_declarations." into main am: 9dc6b1025d
am: 4d6d371aee
am: 34b5c38c44
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2835990
Change-Id: Ibeed93cf217168eeecf9568d1c3c3a5ee568327f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 23:07:44 +00:00
David Srbecky
8e1efb7fc5
Merge "Revert^2 "Enable dex container (DEX v41) for the whole system"" into main
2023-11-30 22:50:55 +00:00
Yu Liu
affccf97fc
Merge "Add container property to aconfig_declarations." into main am: 9dc6b1025d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2835990
Change-Id: I29dc474a19bee00b5224b28b3dc279e80fe10668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 22:31:48 +00:00
Yu Liu
4d6d371aee
Merge "Add container property to aconfig_declarations." into main am: 9dc6b1025d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2835990
Change-Id: I462e13fb5ca1132dce4751afdd91d9b144f6a283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 22:14:19 +00:00
Yu Liu
9dc6b1025d
Merge "Add container property to aconfig_declarations." into main
2023-11-30 21:33:34 +00:00
Jeff Sharkey
7a19abf260
Include Ravenwood tests in general-tests
.
...
EngProd has indicated that we need to be included in that suite to
support TEST_MAPPING files in their infrastructure.
Bug: 308854804
Test: TH
Change-Id: I763b033f0f5f275091db45ab62df6af48dcddc66
2023-11-30 20:20:31 +00:00
David Srbecky
e4d0e949ce
Revert^2 "Enable dex container (DEX v41) for the whole system"
...
This reverts commit 432fbfa848
.
Reason for revert: Reland
Test: device boots
Change-Id: I95e2ae124c6d4a74ca5303f898583de992b15cbd
2023-11-30 15:07:01 +00:00
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
4dea1ca543
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: Idca67d76d1d2690458535ec762cc4c9459f541d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 01:40:03 +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
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
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
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
8f7ee30d21
Merge "Support experimental building with OpenJDK 21" into main
2023-11-29 20:25:25 +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
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
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
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
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
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
Jiakai Zhang
36c8b1d229
Merge "Remove PreoptExtractedApk." into main am: ba45ba5763
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848255
Change-Id: I627974d669b4e978ff555553fa94fd5bfc63f7c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 10:50:42 +00:00
Jiakai Zhang
c6c66b193c
Merge "Remove PreoptExtractedApk." into main am: ba45ba5763
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848255
Change-Id: Ic59752b306914d7c0fc3f3fe58622760364edad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 10:50:34 +00:00
Rico Wind
77379a479f
Merge "Reapply "Use R8 for resource shrinking"" into main am: 2f6b403ccd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2846953
Change-Id: I787623b4073f8c550f6d94ff0855fda873167d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 10:50:13 +00:00
Rico Wind
c761435b78
Merge "Reapply "Use R8 for resource shrinking"" into main am: 2f6b403ccd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2846953
Change-Id: I389f9fef427198e74d5ded5a42c967189dc7e5eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 10:49:42 +00:00
Jiakai Zhang
ba45ba5763
Merge "Remove PreoptExtractedApk." into main
2023-11-29 10:17:29 +00:00
Rico Wind
e2119ee0cc
Merge "Reapply "Use R8 for resource shrinking"" into main
2023-11-29 08:32:21 +00:00
Rico Wind
98e7fa8db1
Reapply "Use R8 for resource shrinking"
...
This reverts commit a9fd59a7f2
.
We are moving the resource shinking pipeline into r8 (gennerally, not just for platform)
This disables the usage of the resource shrinker cli from cmd-line tools
There are no changes in this cl compared to the original land, the fix
was done in R8 (to use the same compression for res folder entries as
in the original)
Bug: 308710394
Bug: 309078004
Test: Existing, validated that resource table on SystemUI was byte<>byte equal, validated uncompression
Merged-In: Ib8a6fb128084e994325b975c46a036cb41494654
Change-Id: Id45b170dd50f75bc87e21ad03b2d0679efb7adc2
2023-11-29 05:07:50 +00:00
Treehugger Robot
a2b2c26986
Merge "Enable dex container (DEX v41) for the whole system" into main am: 7d813e0dba
am: 66dd52b74d
am: ec7bbc9487
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2238838
Change-Id: Id039ea1fd44251d51f03fdc66034823402015086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 02:12:23 +00:00
Treehugger Robot
7e340dbf1d
Merge "Enable dex container (DEX v41) for the whole system" into main am: 7d813e0dba
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2238838
Change-Id: I4fdd0d1ccb9e79489d79504eca526a8590ee8ace
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 01:08:39 +00:00
Treehugger Robot
66dd52b74d
Merge "Enable dex container (DEX v41) for the whole system" into main am: 7d813e0dba
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2238838
Change-Id: I166e8dfcb9e7ad9bfd4c4edfae56beb9215d8680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 01:07:05 +00:00
Anas Sulaiman
9d7a36d17f
allow specifying remote caching opt for rewrapper
...
This is needed to enable local execution via reproxy for metalava
actions for developer builds without causing permissions errors
and without disabling it for other actions.
Bug: b/308154125
Tested: ran a local build and verified all metalava actions were
executed locally without attempting to write to the remote cache.
Change-Id: Ia6f616e1ff5d0c71597ebf688765925ac81d19c3
2023-11-29 00:42:08 +00:00
Yu Liu
eae7b36699
Add container property to aconfig_declarations.
...
Bug: 311155208
Test: Unit test
Change-Id: I7b187138856d0144203961e82b6dad5e2f8eed9d
2023-11-28 12:37:02 -08:00
Rico Wind
20c2010030
Reapply "Use R8 for resource shrinking"
...
This reverts commit a9fd59a7f2
.
We are moving the resource shinking pipeline into r8 (gennerally, not just for platform)
This disables the usage of the resource shrinker cli from cmd-line tools
There are no changes in this cl compared to the original land, the fix
was done in R8 (to use the same compression for res folder entries as
in the original)
Bug: 308710394
Bug: 309078004
Test: Existing, validated that resource table on SystemUI was byte<>byte equal, validated uncompression
Ignore-AOSP-First: Merge does not apply cleanly
Change-Id: Ib8a6fb128084e994325b975c46a036cb41494654
2023-11-28 13:47:02 +00:00
Jiakai Zhang
db93553b02
Remove PreoptExtractedApk.
...
This was added by r.android.com/513843 to force dexpreopt some GMS core
modules even if dexpreopt is disabled, to avoid some memory usage
regression. We no longer need it because dexpreopt is never disabled on
production builds.
Bug: 313505540
Test: m
Change-Id: I605b7569c17ee715cd4df167768e25aaf51bcd37
2023-11-28 13:40:58 +00:00
Søren Gjesse
b82a2a278b
Enable dex container (DEX v41) for the whole system
...
Bug: b/249922554
Test: device boots
Change-Id: Idc63034cc7d5f4bc4533d1f580eeffe1494b56a6
2023-11-28 13:24:21 +00:00
David Srbecky
fb98d76a87
Merge "Change position of R8/D8 flags on the command line." into main am: ea5bb25378
am: efb785c929
am: 59bdf8e28b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2845918
Change-Id: Ieeb159d29328927744e463e1731e667f07449e54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-27 17:19:13 +00:00
Jamie Garside
740f7cd2b3
Add the ability for a java_sdk_library to depend on another. am: e570ace2e4
am: b5429e879e
am: 20f9129baf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2844082
Change-Id: If8b932e404bb6a76a6648950cbee3a97f973e82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-27 17:16:59 +00:00
David Srbecky
97038a2f06
Merge "Change position of R8/D8 flags on the command line." into main am: ea5bb25378
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2845918
Change-Id: Iae423895aebad3c852ea71bc0765d07d10a8ff64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-27 16:29:01 +00:00
David Srbecky
efb785c929
Merge "Change position of R8/D8 flags on the command line." into main am: ea5bb25378
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2845918
Change-Id: Ib2480ac6ccc8ac459cbc9f38bc8c909bf8dfc109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-27 16:28:40 +00:00
Jamie Garside
3dfe5ad6bf
Add the ability for a java_sdk_library to depend on another. am: e570ace2e4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2844082
Change-Id: Ie8fdd2113b502d001894b3ba7a500e0b1676ce26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-27 16:28:15 +00:00
Jamie Garside
b5429e879e
Add the ability for a java_sdk_library to depend on another. am: e570ace2e4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2844082
Change-Id: Iac17dd61875b799fbf6d399401beffc89d463e9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-27 16:15:50 +00:00
David Srbecky
ea5bb25378
Merge "Change position of R8/D8 flags on the command line." into main
2023-11-27 15:44:04 +00:00