Commit Graph

74405 Commits

Author SHA1 Message Date
Colin Cross
b6d6ac7e4f Merge "Delete aapt2 generated java files after creating srcjars" into main am: 482ccfab04 am: b5c37f9bac am: 10ecc7ed1e am: 815ac4eaad am: ed4697d11b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2690453

Change-Id: I27a1a17b44c585cbf998f04877305fe6bf43d203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 22:44:16 +00:00
Colin Cross
ed4697d11b Merge "Delete aapt2 generated java files after creating srcjars" into main am: 482ccfab04 am: b5c37f9bac am: 10ecc7ed1e am: 815ac4eaad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2690453

Change-Id: I4eb292c66ed6e29127dc67938c77408da6d03a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 21:58:33 +00:00
Colin Cross
815ac4eaad Merge "Delete aapt2 generated java files after creating srcjars" into main am: 482ccfab04 am: b5c37f9bac am: 10ecc7ed1e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2690453

Change-Id: I92cb0c0c71014c78b57a5c5f52e7795219826d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 21:16:20 +00:00
Colin Cross
10ecc7ed1e Merge "Delete aapt2 generated java files after creating srcjars" into main am: 482ccfab04 am: b5c37f9bac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2690453

Change-Id: I21073c9b8fae40dced95041c561e7c77b02e375b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 20:32:20 +00:00
Cole Faust
226d25eb6a Merge "Make the bazel sandwich ignore targets that don't exist" into main am: 7997b3bb1c am: b0cc257a43 am: 5001403125 am: 471c0c2cc6 am: 76f5fac4b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2691027

Change-Id: Iccf7de8bc72e1f3cbbca2559b70f3b0110b45147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 20:29:27 +00:00
Spandan Das
ed1e1c66c9 Merge "Special-case go modules in convertedToBazel" into main am: fac9d8e71d am: e4fa916193 am: f7fabcff67 am: 6c903f9a87 am: fff7360ef6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2691135

Change-Id: I733f29fa4c72bcb01ee51680aaac17790b38b7b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 20:29:03 +00:00
Paul Duffin
ceac5e5098 Merge "Revert "Make glob output include product name"" into main am: ff3fcd1f64 am: 5d23bb7d4b am: 571db59b84 am: baf4427959 am: f004f19f51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2692966

Change-Id: I9f1b07d4c1d0be7af6d73319b2b85e327b416464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 20:27:13 +00:00
Colin Cross
b5c37f9bac Merge "Delete aapt2 generated java files after creating srcjars" into main am: 482ccfab04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2690453

Change-Id: Ic20bce67a0fd91f4baa2bb71edd9a1716ed09ed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 19:47:39 +00:00
Cole Faust
76f5fac4b5 Merge "Make the bazel sandwich ignore targets that don't exist" into main am: 7997b3bb1c am: b0cc257a43 am: 5001403125 am: 471c0c2cc6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2691027

Change-Id: Ic4d89b9af3d81dac2be65e4cdb87192bf1d953d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 19:46:05 +00:00
Spandan Das
fff7360ef6 Merge "Special-case go modules in convertedToBazel" into main am: fac9d8e71d am: e4fa916193 am: f7fabcff67 am: 6c903f9a87
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2691135

Change-Id: I008bdd9ea3607bca48a9edfa6ea39a3f486bfae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 19:45:53 +00:00
Paul Duffin
f004f19f51 Merge "Revert "Make glob output include product name"" into main am: ff3fcd1f64 am: 5d23bb7d4b am: 571db59b84 am: baf4427959
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2692966

Change-Id: I0e3663c8a4f461cacd4fb7dd6623340f816f20b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 19:45:18 +00:00
Cole Faust
471c0c2cc6 Merge "Make the bazel sandwich ignore targets that don't exist" into main am: 7997b3bb1c am: b0cc257a43 am: 5001403125
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2691027

Change-Id: I0e934221787378e7ce7baf19005d9aed57404601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 18:58:54 +00:00
Spandan Das
6c903f9a87 Merge "Special-case go modules in convertedToBazel" into main am: fac9d8e71d am: e4fa916193 am: f7fabcff67
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2691135

Change-Id: Iadef2340fc4a589d769d25410f743626410952a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 18:58:43 +00:00
Paul Duffin
baf4427959 Merge "Revert "Make glob output include product name"" into main am: ff3fcd1f64 am: 5d23bb7d4b am: 571db59b84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2692966

Change-Id: Id50084ed47ea9c76b47062b5f948bca7be5ed184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 18:58:16 +00:00
Colin Cross
482ccfab04 Merge "Delete aapt2 generated java files after creating srcjars" into main 2023-08-03 18:57:24 +00:00
Cole Faust
5001403125 Merge "Make the bazel sandwich ignore targets that don't exist" into main am: 7997b3bb1c am: b0cc257a43
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2691027

Change-Id: I47bc16de0b094f0d1b426c9e87a69ff78160068b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 18:13:53 +00:00
Spandan Das
f7fabcff67 Merge "Special-case go modules in convertedToBazel" into main am: fac9d8e71d am: e4fa916193
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2691135

Change-Id: I9ab9c78cb58987c288310ca7b645ea20accf7051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 18:13:39 +00:00
Paul Duffin
571db59b84 Merge "Revert "Make glob output include product name"" into main am: ff3fcd1f64 am: 5d23bb7d4b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2692966

Change-Id: Idec2b7d907e2f660e2c812bb03c83e2fe422e7be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 18:13:11 +00:00
Cole Faust
b0cc257a43 Merge "Make the bazel sandwich ignore targets that don't exist" into main am: 7997b3bb1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2691027

Change-Id: I1a4b58e45523f522b0de89177b86939c235131b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 17:31:32 +00:00
Spandan Das
e4fa916193 Merge "Special-case go modules in convertedToBazel" into main am: fac9d8e71d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2691135

Change-Id: I4209ae7a704eec89924df70f44ca3693f1670813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 17:31:19 +00:00
Paul Duffin
5d23bb7d4b Merge "Revert "Make glob output include product name"" into main am: ff3fcd1f64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2692966

Change-Id: I5ad012fabded311e16d137fc3ce9215372127d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 17:30:15 +00:00
Cole Faust
7997b3bb1c Merge "Make the bazel sandwich ignore targets that don't exist" into main 2023-08-03 16:52:41 +00:00
Spandan Das
fac9d8e71d Merge "Special-case go modules in convertedToBazel" into main 2023-08-03 16:45:49 +00:00
Paul Duffin
ff3fcd1f64 Merge "Revert "Make glob output include product name"" into main 2023-08-03 16:40:47 +00:00
Paul Duffin
d0e8180ea8 Revert "Make glob output include product name"
This reverts commit 03e50cb4d7.

Reason for revert: I think it broke globbing, see b/294378814

Change-Id: I7e81e8e591278bc2d6b6203b93f128351ca6a241
2023-08-03 15:50:16 +00:00
Colin Cross
3b1e71c958 Delete aapt2 generated java files after creating srcjars
The R.java files generated by aapt2 are unused after they are zipped
into srcjars.  These files can huge, reaching 500 MB for some modules
and 76 GB across all modules for a checkbuild on internal main.
Delete the R.java files after after zipping them into srcjars.

Bug: 294285775
Test: m checkbuild
Change-Id: Ie5143e1e4b36ca1f4e45b001d79aca5379063517
2023-08-02 21:50:37 -07:00
Treehugger Robot
809d356092 Merge "Make glob output include product name" into main am: 4d730a8f14 am: e64a844b48 am: c91f36ab7a am: 8303eb4a55 am: d46df6c68a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2687246

Change-Id: I2bea44b9a498ad860fe6751af8c80124dc9ad71b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 04:37:48 +00:00
Rico Wind
a1568440f9 Merge "Enable compact entries for resource shrunken apps" into main 2023-08-03 04:32:07 +00:00
Treehugger Robot
d46df6c68a Merge "Make glob output include product name" into main am: 4d730a8f14 am: e64a844b48 am: c91f36ab7a am: 8303eb4a55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2687246

Change-Id: I7c30958b8944a00be6fc572603645d536eb47c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 03:55:35 +00:00
Roy Luo
abef5e0521 Merge "Revert "Reland "Enable R8 full mode by default for apps""" into main am: 2631bcd34e am: 32a36aee82 am: dac496989f am: 2c833ba8e5 am: a7c09d58db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2690450

Change-Id: Ib7e9da547dac5c550d89800c5ddcc39b3004f160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 03:35:43 +00:00
Treehugger Robot
8303eb4a55 Merge "Make glob output include product name" into main am: 4d730a8f14 am: e64a844b48 am: c91f36ab7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2687246

Change-Id: I251519d89831847e958866971c159ac714a774f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 03:12:51 +00:00
Roy Luo
a7c09d58db Merge "Revert "Reland "Enable R8 full mode by default for apps""" into main am: 2631bcd34e am: 32a36aee82 am: dac496989f am: 2c833ba8e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2690450

Change-Id: Iba9487dc017c784158fcc7033c5e24f2622eb4e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 02:49:13 +00:00
Treehugger Robot
c91f36ab7a Merge "Make glob output include product name" into main am: 4d730a8f14 am: e64a844b48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2687246

Change-Id: I638ad1d4e17b60fd6d2c5e00ecab33801d6a3cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 02:26:49 +00:00
Roy Luo
2c833ba8e5 Merge "Revert "Reland "Enable R8 full mode by default for apps""" into main am: 2631bcd34e am: 32a36aee82 am: dac496989f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2690450

Change-Id: Icb2b691c0f924e7edb5c88eeecec87097a6b23e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 02:05:31 +00:00
Treehugger Robot
e64a844b48 Merge "Make glob output include product name" into main am: 4d730a8f14
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2687246

Change-Id: Ic089088d9d6883094fed6e05dd0f840c92f3c40a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 01:40:49 +00:00
Roy Luo
dac496989f Merge "Revert "Reland "Enable R8 full mode by default for apps""" into main am: 2631bcd34e am: 32a36aee82
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2690450

Change-Id: Ia73dc4bc6726dca7bf9ba0d8741ac36c48f29ae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 01:20:01 +00:00
Treehugger Robot
4d730a8f14 Merge "Make glob output include product name" into main 2023-08-03 00:47:32 +00:00
Roy Luo
32a36aee82 Merge "Revert "Reland "Enable R8 full mode by default for apps""" into main am: 2631bcd34e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2690450

Change-Id: Ie72bf1879c44f9e811b073244c91f0cf77612196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 00:33:53 +00:00
Treehugger Robot
b94254b951 Merge "Limit LTO inlining even when profile is present" into main am: 3ff50d5854 am: 0e0b43a5ee am: 57655e5e87 am: 8f3fe9956e am: b43dbf87b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2684608

Change-Id: Ia03b96b4e0e5ad8cc779f58785b6b773be6f7b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 00:15:07 +00:00
Treehugger Robot
a9b79741cf Merge "Reland "Enable R8 full mode by default for apps"" into main am: cfe9e6d008 am: 413d7a88f3 am: 7b1b04b1aa am: 79ca64fada am: fdfee10f22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2681381

Change-Id: I0ce736cd3102625b9a280335961c5aac933aa85b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 00:13:58 +00:00
Kevin Jeon
fb1d90a0fd Add libdumpstateutil to vendor variant list am: 6e0dbf887e am: 5fcb469531 am: cacb960622
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24286944

Change-Id: I6e6af1ff5130972e7f67e94ba79a09406d19a1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 00:11:50 +00:00
Treehugger Robot
b43dbf87b4 Merge "Limit LTO inlining even when profile is present" into main am: 3ff50d5854 am: 0e0b43a5ee am: 57655e5e87 am: 8f3fe9956e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2684608

Change-Id: I85f8cf2eb9b123d2e138adc846e55a33caffbc63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 00:11:01 +00:00
Treehugger Robot
fdfee10f22 Merge "Reland "Enable R8 full mode by default for apps"" into main am: cfe9e6d008 am: 413d7a88f3 am: 7b1b04b1aa am: 79ca64fada
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2681381

Change-Id: I6c602a4ec07194be73333535423b148414f4ee27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 00:10:30 +00:00
Roy Luo
2631bcd34e Merge "Revert "Reland "Enable R8 full mode by default for apps""" into main 2023-08-03 00:00:25 +00:00
Roy Luo
74a5c2ec76 Revert "Reland "Enable R8 full mode by default for apps""
This reverts commit a9f5c57b90.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/test_investigate/?invocationId=I59400010184068138&testResultId=TR41428835561759069&tab=trace, bug b/294287299

Bug:294287299
Change-Id: Id7bbe3b1a4cdc999c6a4cb9002b60c882b34f11e
2023-08-02 23:56:46 +00:00
Treehugger Robot
8f3fe9956e Merge "Limit LTO inlining even when profile is present" into main am: 3ff50d5854 am: 0e0b43a5ee am: 57655e5e87
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2684608

Change-Id: Ifd158bc5f1d87f3f6c6c27eeb0a284668042a8a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 23:52:39 +00:00
Treehugger Robot
79ca64fada Merge "Reland "Enable R8 full mode by default for apps"" into main am: cfe9e6d008 am: 413d7a88f3 am: 7b1b04b1aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2681381

Change-Id: Ife22e9792f27e2dcf1919fc47a4c5e3b17a3b961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 23:51:15 +00:00
Kevin Jeon
cacb960622 Add libdumpstateutil to vendor variant list am: 6e0dbf887e am: 5fcb469531
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24286944

Change-Id: I8853dbb0f5b21716bdaf7fe14182042ce31ab7b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 23:47:32 +00:00
Kevin Jeon
202636cd16 Add libdumpstateutil to vendor variant list am: 6e0dbf887e am: 042235b1a9 am: c79398b873
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24286944

Change-Id: I52796ff07a80f89248948af984dcb2015ec0ed2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 23:30:56 +00:00
Wei Li
82f0ee7705 Merge "Add integration test for verifying package verification code in SBOM." into main am: b82c236cbb am: 48f0868a39 am: 2977500d4c am: b2c4767155 am: 563ce2d622
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2687733

Change-Id: I1cb3af7e4e28e650e38191a414d56adb7024fec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 23:28:04 +00:00