Commit Graph

71967 Commits

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

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

Change-Id: If1bf38ec6f89c4a8085505b696854226c25acf08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 16:58:02 +00:00
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
88f2353249 Merge "Revert "Add workaround for a file with an mtime in the future"" into main am: 1c535124d5 am: a70c20dbc7 am: 67fd86ce6a am: f3de4be99c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2666138

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

Change-Id: Ic8215e85aa1c396eb013a66dfc4a6947b344e11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-22 06:05:44 +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
02532f0b0a Merge "Remove libandroid_support support." into main am: 460fb2d6d5 am: d27f77db56 am: a2521e02a5 am: 8ffcc11db9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2667796

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

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

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

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

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

Change-Id: I08c6f33ac5f3fbfd3479b79a3a8a0bd80d0836d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 22:59:51 +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
Treehugger Robot
144ec6dec2 Merge "Add aconfig flags and a generic generated library plugin module for cc" into main am: 8b8846ae1c am: fc7ee5166c am: 6ecb2fe30a am: 8ba774eb6d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663517

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

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

Change-Id: I7df60bd9a3a0f66043af1f8e0c943eee8c52648e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 21:28:40 +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
8ba774eb6d Merge "Add aconfig flags and a generic generated library plugin module for cc" into main am: 8b8846ae1c am: fc7ee5166c am: 6ecb2fe30a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663517

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

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

Change-Id: Ib27ea2c29af2a32e7457d793033f2d41afff6de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 20:43:27 +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
Treehugger Robot
2bf347abe9 Merge "Ignore some new files added to partition images in sbom_test.sh." into main am: e4d58523b6 am: 16a26192c9 am: 2678b393b9 am: dd7ba30bcb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660536

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

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

Change-Id: I1ec820e4d976fca1ee8d20aaa665349b3a44903a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 16:36:45 +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
dd7ba30bcb Merge "Ignore some new files added to partition images in sbom_test.sh." into main am: e4d58523b6 am: 16a26192c9 am: 2678b393b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660536

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

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

Change-Id: I5d02926b3aada6bc29c212bafd6ff323a9f6a0f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 15:50:57 +00: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