Commit Graph

66393 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
408e6e3aa6 Merge "Symlink to rules_java in soong integration test." into main am: 2cbbfb9e1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2667475

Change-Id: I83b131ff628b5110b200c58a6f4fcdb593d9888f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 17:44:44 +00:00
David Fu
27cc9cd2f4 Merge "Added haiku presubmit packaging" into main am: 26661d1bb0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652339

Change-Id: Id900e4c18022e0eb69bdac790d8c218d4873521e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 17:41:42 +00:00
Yu Liu
2cbbfb9e1d Merge "Symlink to rules_java in soong integration test." into main 2023-07-20 17:09:04 +00:00
David Fu
26661d1bb0 Merge "Added haiku presubmit packaging" into main 2023-07-20 17:00:05 +00:00
Cole Faust
88c8efb18c Add CFI product config variables to platform_mappings
Bug: 269577299
Fixes: 283130542
Test: b test --config=android //build/bazel/rules/cc/...
Change-Id: I2fc4094167c48b1f3b22bee6b7ada309278f7250
2023-07-20 09:45:36 -07:00
Romain Jobredeaux
ca4706b474 Symlink to rules_java in soong integration test.
Bug: 292023656
Test: CI + ABTD
Change-Id: I3ac87154c2d77cb18c7ba60f638b5787cef57606
2023-07-20 09:41:29 -04:00
Yu Liu
1b24c106a2 Merge "denylist boringssl_test_support before we fully support cc_test_library" into main am: 4c9b3e114b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665790

Change-Id: I84f821f6c187e071a988a9eedc9e68a116b4b88d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 04:54:54 +00:00
Yu Liu
4c9b3e114b Merge "denylist boringssl_test_support before we fully support cc_test_library" into main 2023-07-20 04:16:22 +00:00
Treehugger Robot
5361b43ddb Merge "Fix typo in mutator name" into main am: e2cfe50279
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665657

Change-Id: Ie279f6392dcf3ae09fb63e2b4a5d3ca024c7a468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 02:17:30 +00:00
Treehugger Robot
e2cfe50279 Merge "Fix typo in mutator name" into main 2023-07-20 01:30:58 +00:00
David Fu
fd121fcfd7 Added haiku presubmit packaging
Change-Id: I6cdb06fe0c2d7dd6320a1dafe859172b280dd53c
2023-07-19 23:46:02 +00:00
Romain Jobredeaux
48ed4967a8 Merge "Keep rules_java vendored repository BUILD files" into main am: 0ccd94cefa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665780

Change-Id: Iaadfe677e6b328d8380e6417fcf6d6b4895dea5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 23:39:48 +00:00
Yu Liu
1d03d176a9 denylist boringssl_test_support before we fully support cc_test_library
Bug: 291962016
Test: CI
Change-Id: I20596fe3f70d0a27b12b39a288df753c0befb891
2023-07-19 23:39:41 +00:00
Treehugger Robot
b75d09dfd6 Merge "Pass declarations as separate arguments" into main am: 55d25a435f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665976

Change-Id: Ib6a7eb226f08865b3950d42f6598eb91c2110b27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 23:39:33 +00:00
Romain Jobredeaux
0ccd94cefa Merge "Keep rules_java vendored repository BUILD files" into main 2023-07-19 23:22:11 +00:00
Treehugger Robot
55d25a435f Merge "Pass declarations as separate arguments" into main 2023-07-19 23:01:38 +00:00
Spandan Das
950091ce29 Fix typo in mutator name
Change-Id: I1aa249e0c2095afb3bdd6eb9f1da62f75607b261
Test: N/A
2023-07-19 22:26:37 +00:00
Treehugger Robot
11bc03a14f Merge "Convert requested SDK version if preview API level" into main am: 12a1f9182d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663339

Change-Id: I810dbfae2db8ea47d50a169fbe41b36d7b16408a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 20:42:26 +00:00
Treehugger Robot
12a1f9182d Merge "Convert requested SDK version if preview API level" into main 2023-07-19 20:05:05 +00:00
Romain Jobredeaux
01e6b2c788 Keep rules_java vendored repository BUILD files
Test: CI
Bug: 291828210
Bug: 287596254
Change-Id: Ic8a3a1966cc82816b74f0efe59c27fae70552c11
2023-07-19 15:27:13 -04:00
Spandan Das
5c1e2af1bf Merge changes from topic "build_go_source_mixed_builds" into main am: 958ca02582
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627439

Change-Id: I14e2394b5543e6f19c0ce79ae5ef1e9610a99cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 18:06:25 +00:00
Zhi Dou
8a35a6fa71 Pass declarations as separate arguments
Aconfig take declarations as separate arguments if there are multiple
declaration files.

Bug: 291926035
Test: build flags
Change-Id: Ic0d069184f48ceaf8947acc5b951eecff7c308f9
2023-07-19 18:04:24 +00:00
Spandan Das
958ca02582 Merge changes from topic "build_go_source_mixed_builds" into main
* changes:
  Delete aliases to prebuilts
  Add functionality to sandbox mixed build actions
2023-07-19 17:21:25 +00:00
Sam Delmerico
351e7c83b8 Merge "make android.InList generic" into main am: cfcd0a4960
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660959

Change-Id: I2a9c17ee76fde7d31ed81608712a2a47c557c47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 15:11:34 +00:00