Commit Graph

70437 Commits

Author SHA1 Message Date
Treehugger Robot
03a60cd0da Merge changes I69f80d12,I40d48644 into main am: ed89d33fb1 am: 22283ef0d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663338

Change-Id: Ie23874de0ac7a1428c2aaf64e1ede20a004257db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 16:13:27 +00:00
Treehugger Robot
22283ef0d4 Merge changes I69f80d12,I40d48644 into main am: ed89d33fb1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663338

Change-Id: Ic47099862ca71ff6e16c7f638fbb59ddae3fbf24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 15:29:39 +00:00
Treehugger Robot
ed89d33fb1 Merge changes I69f80d12,I40d48644 into main
* changes:
  Merge META-INF/services/* files in merge_zips -jar
  Strip META-INF/services from implementation jars when using as header jars
2023-07-24 14:27:25 +00:00
Cole Faust
67fd86ce6a Merge "Revert "Add workaround for a file with an mtime in the future"" into main am: 1c535124d5 am: a70c20dbc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2666138

Change-Id: I2f996922fd4ecd249ef6d3e4c5e3f41109fb12e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-22 05:23:04 +00:00
Cole Faust
a70c20dbc7 Merge "Revert "Add workaround for a file with an mtime in the future"" into main am: 1c535124d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2666138

Change-Id: I173062dd3663160cfcfe8cf0a4f63e21b78b73f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-22 04:40:12 +00:00
Cole Faust
1c535124d5 Merge "Revert "Add workaround for a file with an mtime in the future"" into main 2023-07-22 04:01:59 +00:00
Dan Albert
a2521e02a5 Merge "Remove libandroid_support support." into main am: 460fb2d6d5 am: d27f77db56
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2667796

Change-Id: Icf18bc7b0d200f57005323f3169cb48c2e5ada49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 22:15:04 +00:00
Treehugger Robot
fd584ebb51 Merge "Allowlist additional deps of inputflinger" into main am: cc8c8e5f8d am: a6f7d19d2c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643053

Change-Id: I8b9f1c816bb5454a8e73672004c8c640cc883e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 22:14:52 +00:00
Zi Wang
f362600dc8 Merge "java_test macro needs srcs and deps to create .jar for tradefed_test_suite" into main am: 8348ce92f5 am: 1c29688852
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660942

Change-Id: I6dc51ffab3ef187cff433975096fa55088c273d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 22:13:00 +00:00
Dan Albert
d27f77db56 Merge "Remove libandroid_support support." into main am: 460fb2d6d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2667796

Change-Id: I5760f6292187c1ecf7239fbc42c89e1a511beb49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 21:33:58 +00:00
Treehugger Robot
a6f7d19d2c Merge "Allowlist additional deps of inputflinger" into main am: cc8c8e5f8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643053

Change-Id: I697c6d67eb01ae6fa0fb127f7b49767d81dddff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 21:33:46 +00:00
Zi Wang
1c29688852 Merge "java_test macro needs srcs and deps to create .jar for tradefed_test_suite" into main am: 8348ce92f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660942

Change-Id: If3ebc458f67e844a206b980e60cd26d0428b9b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 21:33:31 +00:00
Dan Albert
460fb2d6d5 Merge "Remove libandroid_support support." into main 2023-07-21 21:06:41 +00:00
Treehugger Robot
cc8c8e5f8d Merge "Allowlist additional deps of inputflinger" into main 2023-07-21 21:03:39 +00:00
Zi Wang
8348ce92f5 Merge "java_test macro needs srcs and deps to create .jar for tradefed_test_suite" into main 2023-07-21 20:48:13 +00:00
Treehugger Robot
6ecb2fe30a Merge "Add aconfig flags and a generic generated library plugin module for cc" into main am: 8b8846ae1c am: fc7ee5166c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663517

Change-Id: If368097280c46354400448ea196fbade799da488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 20:02:19 +00:00
Romain Jobredeaux
6d877dced9 Merge "Add DeviceAbi to product variable to build setting export" into main am: 66b27cb853 am: a71e3edc69
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2667476

Change-Id: Ieafe7ef08002ba42670d7ddc928d6a015a611dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 20:02:00 +00:00
Cole Faust
845342127a Merge "Denylist genrules that fail to build with sandboxing" into main am: d95158ef1a am: 572adcd6ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2669475

Change-Id: I33dcdda6a0484cf0306254d4d03d42a57700f0a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 20:01:26 +00:00
Treehugger Robot
fc7ee5166c Merge "Add aconfig flags and a generic generated library plugin module for cc" into main am: 8b8846ae1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663517

Change-Id: I009c6bb5a598b5b2174e81916a87a571350e52ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 19:16:33 +00:00
Romain Jobredeaux
a71e3edc69 Merge "Add DeviceAbi to product variable to build setting export" into main am: 66b27cb853
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2667476

Change-Id: If46017b04e96315c3ef3742126c52493144146cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 19:15:49 +00:00
Cole Faust
572adcd6ef Merge "Denylist genrules that fail to build with sandboxing" into main am: d95158ef1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2669475

Change-Id: Ib74721f47d5001424fdbd1d660bea4ba3c6714a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 19:15:28 +00:00
Treehugger Robot
8b8846ae1c Merge "Add aconfig flags and a generic generated library plugin module for cc" into main 2023-07-21 19:09:28 +00:00
Romain Jobredeaux
66b27cb853 Merge "Add DeviceAbi to product variable to build setting export" into main 2023-07-21 18:40:17 +00:00
Cole Faust
d95158ef1a Merge "Denylist genrules that fail to build with sandboxing" into main 2023-07-21 18:20:06 +00:00
Joe Onorato
37f900ca7f Add aconfig flags and a generic generated library plugin module for cc
The generated module lets us keep the aconfig code in its own pacakge
and not infect all of the cc package with aconfig. It's also closer
to what bazel is going to do

Bug: 283479529
Test: m aconfig_hello_world_cc && adb push $TOP/out/target/product/panther/system/bin/aconfig_hello_world_cc /system/bin && adb shell aconfig_hello_world_cc
Change-Id: I2fb9e419939c7ca77b111da9c376af077e2348a9
2023-07-21 09:04:42 -07:00
Treehugger Robot
2678b393b9 Merge "Ignore some new files added to partition images in sbom_test.sh." into main am: e4d58523b6 am: 16a26192c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660536

Change-Id: Idb5f5bfe5d8c693f77141a76c9ebacbacfd30f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 15:07:16 +00:00
Treehugger Robot
fdfe8d1dbb Merge "Track transitive usage of aconfig flags and add LOCAL_ACONFIG_FILES to Android-<product>.mk" into main am: 8bad43ad53 am: a4f896ab0d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2645432

Change-Id: Icd5efe9e9765d1cea721a74e76a3c3dda50b68f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 15:07:10 +00:00
Liz Kammer
008f72c012 Merge "Make genrule export_include_dirs more consistent" into main am: d07cb48c6f am: 2d94b9bf0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657600

Change-Id: I095091e4483e952efc0da469f60e243d420e184b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 15:06:11 +00:00
Treehugger Robot
16a26192c9 Merge "Ignore some new files added to partition images in sbom_test.sh." into main am: e4d58523b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660536

Change-Id: I4fde1b45439bbc9794a365e31351db6a9b7c6d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 14:46:36 +00:00
Treehugger Robot
a4f896ab0d Merge "Track transitive usage of aconfig flags and add LOCAL_ACONFIG_FILES to Android-<product>.mk" into main am: 8bad43ad53
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2645432

Change-Id: Ib299f0b55b0f5540286e0974b2d7512d4991fa42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 14:46:31 +00:00
Treehugger Robot
e4d58523b6 Merge "Ignore some new files added to partition images in sbom_test.sh." into main 2023-07-21 14:34:44 +00:00
Treehugger Robot
8bad43ad53 Merge "Track transitive usage of aconfig flags and add LOCAL_ACONFIG_FILES to Android-<product>.mk" into main 2023-07-21 14:34:44 +00:00
Liz Kammer
2d94b9bf0a Merge "Make genrule export_include_dirs more consistent" into main am: d07cb48c6f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657600

Change-Id: Id221aba6417fb8a0b0108f1940ca24965b4783ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 14:23:30 +00:00
Romain Jobredeaux
cc1b67631c Add DeviceAbi to product variable to build setting export
Change-Id: Ibcb9e77a28bf0c4c0915f7013a7408f65429ae15
2023-07-21 10:05:28 -04:00
Liz Kammer
d07cb48c6f Merge "Make genrule export_include_dirs more consistent" into main 2023-07-21 13:41:23 +00:00
Treehugger Robot
66dca00513 Merge "Relax preprocessed apk check for non-privileged apps" into main am: 9064761816 am: ea7d85fc37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2670157

Change-Id: If0aef0632b03218b1a26b94f89de640c14813d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 05:12:33 +00:00
Treehugger Robot
ea7d85fc37 Merge "Relax preprocessed apk check for non-privileged apps" into main am: 9064761816
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2670157

Change-Id: I9fb5b04444c2b86733808484f7c1ee586ca99a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 04:30:54 +00:00
Treehugger Robot
9064761816 Merge "Relax preprocessed apk check for non-privileged apps" into main 2023-07-21 03:47:42 +00:00
Treehugger Robot
96fea7e95f Merge "Enable restat for javac rules" into main am: 340591c729 am: 3c1dd65ce0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627202

Change-Id: Ibadb54a8f11343229f65bca20b1a578060e27228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 02:36:21 +00:00
Treehugger Robot
3c1dd65ce0 Merge "Enable restat for javac rules" into main am: 340591c729
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627202

Change-Id: I20a062249543466134f2e4cac61c50d98abbca38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 01:55:19 +00:00
Treehugger Robot
340591c729 Merge "Enable restat for javac rules" into main 2023-07-21 01:18:27 +00:00
Cole Faust
93b89b4110 Relax preprocessed apk check for non-privileged apps
Non-priviledged apps can have compressed dex files.
See go/gms-uncompressed-jni-slides

Bug: 185811447
Test: Presubmits
Change-Id: I14f70fb9286bce132e451a0c930333455517cdc3
2023-07-20 17:57:33 -07:00
Cole Faust
edbabc6075 Denylist genrules that fail to build with sandboxing
Bug: 290816499
Test: run genrule_sandobx_test.py with a local change to check all genrules in the tree
Change-Id: I258fe11640c71d532ef48ed88270dec72bd69814
2023-07-20 15:39:04 -07:00
Treehugger Robot
57073321bf Merge "Add CFI product config variables to platform_mappings" into main am: 00d0d7af7d am: 110f8b4a08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660958

Change-Id: I138ab0e844dc8bc22327ec53c2af6d0883b3898a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 21:07:33 +00:00
Treehugger Robot
110f8b4a08 Merge "Add CFI product config variables to platform_mappings" into main am: 00d0d7af7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660958

Change-Id: I1a34b26c6dde03115a392814fa6014a51a9e87ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 20:19:40 +00:00
Treehugger Robot
00d0d7af7d Merge "Add CFI product config variables to platform_mappings" into main 2023-07-20 19:31:41 +00:00
Colin Cross
7592d5a0bd Merge META-INF/services/* files in merge_zips -jar
kotlinx_coroutines_test and kotlinx_coroutine_android each provide a
META-INF/services/kotlinx.coroutines.CoroutineExceptionHandler with
different contents, and the final contents needs to be the combination
of the two files.  Implement service merging in merge_zips when the
-jar argument is provided.

Bug: 290933559
Test: TestMergeZips
Change-Id: I69f80d1265c64c671d308ef4cdccfa1564abe056
2023-07-20 18:59:35 +00:00
Joe Onorato
6fe59eb7f0 Track transitive usage of aconfig flags and add LOCAL_ACONFIG_FILES to Android-<product>.mk
Bug: 283910439
Test: m nothing (runs soong tests)
Change-Id: I59f9bef7b7c502565d531a5685c002a177e0a77c
2023-07-20 11:33:06 -07:00
LaMont Jones
feff3f3f99 Enable restat for javac rules
Bug: 280820245
Test: presubmit
Change-Id: I315fb864f8df3d749fa1545b6e59ee37f8f5ec18
2023-07-20 18:28:54 +00:00
Yu Liu
03844740b2 Merge "Symlink to rules_java in soong integration test." into main am: 2cbbfb9e1d am: 408e6e3aa6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2667475

Change-Id: Ib19320d84e763ca2fca5458de910ffd7824a64e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 18:28:53 +00:00