Aditya Choudhary
e4bc39a3af
Merge changes from topic "code_metadata" into main am: 4c3e2df157
am: d798f5c879
am: 519452c5ad
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852607
Change-Id: I43080cae5ee6eea4c71d309e6778552543950f89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-06 09:30:00 +00:00
Aditya Choudhary
bacf236669
Add Code Metadata rule to soong/testing. am: 8094b6bf9d
am: 7d37796d24
am: f1c7380dd6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786121
Change-Id: Idcbb54dea58ff61ad430eee2e21b79bf01eb7219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-06 09:29:54 +00:00
Aditya Choudhary
d798f5c879
Merge changes from topic "code_metadata" into main am: 4c3e2df157
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852607
Change-Id: Icc9c1eda9b93e1ec897425b98cb8f16f83431409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-06 08:11:06 +00:00
Aditya Choudhary
7d37796d24
Add Code Metadata rule to soong/testing. am: 8094b6bf9d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786121
Change-Id: I40154b3f9d2c170cb7aacbf6f0b9383b2e87f444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-06 08:11:01 +00:00
Aditya Choudhary
26df39fe44
Add source file provider for genrule/srcs, python libraries and rust libraries.
...
Change-Id: I2d7d4684a10c15aeecc27b8db800ab27a807d2e2
2023-12-05 19:56:26 +00:00
Aditya Choudhary
8094b6bf9d
Add Code Metadata rule to soong/testing.
...
This Cl adds a new rule to Soong to generate code ownership metadata. Also, this CL adds a provider in the Java SDK library to provide generated source files to the Code_metadata rule. Will add providers to other libraries in the future changes.
Bug: 296873595
Change-Id: Ic2e43aa9b161231fea4416d1f0d36b778361d7c5
2023-12-05 18:10:03 +00:00
Colin Cross
08aa480493
Merge "Add TestContext parameter to ContentFromFileRuleForTests" into main am: 2998c33d43
am: e4f28b5a03
am: 602e7436cb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817720
Change-Id: I9389644aa173115ea9134e9db4f5154a5501eb96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-05 02:18:16 +00:00
Colin Cross
078254139c
Merge "Add TestContext parameter to ContentFromFileRuleForTests" into main am: 2998c33d43
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817720
Change-Id: Iaf65c68d8c427a5d991401f85bd1c220b2303a9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-05 01:37:56 +00:00
Colin Cross
e4f28b5a03
Merge "Add TestContext parameter to ContentFromFileRuleForTests" into main am: 2998c33d43
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817720
Change-Id: If970d7ed844d01913dae37cf1398248714775814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-05 01:09:37 +00:00
Colin Cross
2998c33d43
Merge "Add TestContext parameter to ContentFromFileRuleForTests" into main
2023-12-05 00:29:10 +00:00
Jeff Sharkey
433be482ae
Merge "Include Ravenwood tests in general-tests
." into main
2023-12-04 18:15:35 +00:00
Colin Cross
f61d03d241
Add TestContext parameter to ContentFromFileRuleForTests
...
The next CL will need a TestContext parameter in
ContentFromFileRuleForTests in order to retrieve the file rule contents
from the Config. Add it and update all the tests that use it in order
to simply review of the next CL.
Bug: 306029038
Test: go test ./...
Change-Id: Ia4b4c9854017ea3472fa2f8ba42cf7f72720496e
2023-12-03 17:22:56 -08:00
Serdar Kocdemir
2e284d4698
Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main am: 3d11d51733
am: 96e84f84ac
am: c6176eb969
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852551
Change-Id: Ibaf846649f57fb4c1b403462c45dd5373a6eec03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 17:26:10 +00:00
Serdar Kocdemir
3199916366
Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main am: 3d11d51733
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852551
Change-Id: If15286412361df19293b5637f84f430840a87321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 16:31:58 +00:00
Serdar Kocdemir
96e84f84ac
Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main am: 3d11d51733
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852551
Change-Id: Ideb430cdb884fde634ff497108ba63228e3bc3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 16:22:21 +00:00
Serdar Kocdemir
3d11d51733
Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main
2023-12-01 15:39:47 +00:00
Serdar Kocdemir
0968a93679
Revert^3 "Enable dex container (DEX v41) for the whole system"
...
This reverts commit e4d0e949ce
.
Reason for revert: test monitor b/314212435
Change-Id: I53cd60d82f432d4eff132b5ee28227ece1ded7af
2023-12-01 13:33:11 +00:00
David Srbecky
e90dc4b4fb
Merge "Revert^2 "Enable dex container (DEX v41) for the whole system"" into main am: 8e1efb7fc5
am: 0cc9d2673f
am: a8c63ff7bf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853426
Change-Id: I413cc8b290bf3497ac28898f02ca699d081fbb93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 00:48:42 +00:00
David Srbecky
c65e421074
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: Ifb7a0186a73913b9d8c88f5c97a9ac116cf0ffc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 23:53:34 +00:00
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