Commit graph

62800 commits

Author SHA1 Message Date
Treehugger Robot
317ebf2dcb Merge "mixed builds: add cc_test bazel handler, and add adbd_test to staging allowlist." am: 597894279d am: f5eaaae7f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2337087

Change-Id: Ic6209a74558401fc2e05c9ba6e8efe70aee2620f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 04:05:26 +00:00
Treehugger Robot
f5eaaae7f6 Merge "mixed builds: add cc_test bazel handler, and add adbd_test to staging allowlist." am: 597894279d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2337087

Change-Id: I4da1986a5b8db6bb8b359e850707ca9b097d8279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 03:32:45 +00:00
Jared Duke
1969a9ff5f Revert "Revert "Include proguard flag files from transitive java_library deps"" am: 5979b30170 am: 0b7690cc42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2363992

Change-Id: Ibe664ca4df248b2ea49357559c4b74775f5697b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 03:25:36 +00:00
Treehugger Robot
597894279d Merge "mixed builds: add cc_test bazel handler, and add adbd_test to staging allowlist." 2022-12-20 03:12:53 +00:00
Jared Duke
0b7690cc42 Revert "Revert "Include proguard flag files from transitive java_library deps"" am: 5979b30170
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2363992

Change-Id: I7647e130a78774b170864544c7fd988ab63c4cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 02:52:14 +00:00
Jared Duke
5979b30170 Revert "Revert "Include proguard flag files from transitive java_library deps""
This reverts commit 6f7e288fb5.

Reason for revert: Downstream proguard usage has been fixed.

Change-Id: I3667e7e908eebc62c640b42cb96b04993fc66e45
2022-12-19 23:05:28 +00:00
Chris Parsons
6279a20744 Update allowlist to fix build am: 52b842a1fa am: 012e736bcb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2364220

Change-Id: I711b9e935eb15bd7bdf5e8760bc847c839059ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 18:31:19 +00:00
Chris Parsons
012e736bcb Update allowlist to fix build am: 52b842a1fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2364220

Change-Id: I76e183194dc12f70d4cceb3a2769ad63c26c543e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 17:52:43 +00:00
Chris Parsons
52b842a1fa Update allowlist to fix build
A dependency added in aosp/2353522 resulted in bazel-mode-dev to start
failing. This CL updates the allowlist to support the new dependency.

Test: build/bazel/ci/mixed_libc.sh
Change-Id: I03ac035517a66ff0b21543e8b94d71c9d7ddb461
2022-12-19 11:45:23 -05:00
Treehugger Robot
98c03d5f23 Merge "Add test for missing certificate with AllowMissingDependencies" am: 0db300d9da am: 4046b8002e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2347242

Change-Id: Ie0777b6eb287b1d7344ebc3d0fcc8a2126f4b99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 14:20:50 +00:00
Treehugger Robot
4046b8002e Merge "Add test for missing certificate with AllowMissingDependencies" am: 0db300d9da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2347242

Change-Id: I3c304b49b6cf88255c4a4926b3576e15d494813b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 13:46:45 +00:00
Treehugger Robot
0db300d9da Merge "Add test for missing certificate with AllowMissingDependencies" 2022-12-19 13:11:16 +00:00
Cole Faust
8aeade9c70 Merge "Allow exporting bazel mixed build allowlists to simple text files" am: abc182cc94 am: 770ee2e9a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2356322

Change-Id: I9c2a1c2c7a7603ce1290129d5462550c66a885eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 04:23:56 +00:00
Cole Faust
770ee2e9a4 Merge "Allow exporting bazel mixed build allowlists to simple text files" am: abc182cc94
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2356322

Change-Id: Ic2f7d46dac7deb5ddb3c05d8219faefcb4c24d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 03:50:55 +00:00
Cole Faust
abc182cc94 Merge "Allow exporting bazel mixed build allowlists to simple text files" 2022-12-19 03:09:11 +00:00
Kevin Dagostino
11696ef599 Add tradefed attributes to cc_test bazel macro am: 32edd1a608 am: cca6163ec8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2324655

Change-Id: Ife4ca275feb3fed08c5d75c7122fd6268df33e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-18 08:42:40 +00:00
Kevin Dagostino
cca6163ec8 Add tradefed attributes to cc_test bazel macro am: 32edd1a608
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2324655

Change-Id: I3bde15a18144338e819df9bc2023352acab0b11a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-18 08:09:48 +00:00
Kevin Dagostino
32edd1a608 Add tradefed attributes to cc_test bazel macro
The BUILD file will now have the needed attributes to run the tradefed
test rules.

Test: b test //packages/modules/adb:adbd_test --platforms=//build/bazel/platforms:android_target
Change-Id: I5cb84ccdde27a7fadbef479269df594344a29187
2022-12-18 04:38:16 +00:00
Treehugger Robot
9cc6a01ba1 Merge "Allow adding extra tradefed options in the Android.bp file" am: 2731ca8377 am: 38a70ef746
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2334246

Change-Id: I6322c026f82fafeb4b57b7d584f76b119ae22219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17 04:40:46 +00:00
Colin Cross
b7a9576fdc Merge "Revert "Include proguard flag files from transitive java_library deps"" am: ed8b52ca27 am: 47cbbc5749
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2362567

Change-Id: I9e461aa68bcadd7f823c87c8b14217c8dd658f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17 04:40:27 +00:00
Treehugger Robot
38a70ef746 Merge "Allow adding extra tradefed options in the Android.bp file" am: 2731ca8377
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2334246

Change-Id: I6a7128712f819f03b6c38d8883eac4eec7aa2140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17 04:07:40 +00:00
Colin Cross
47cbbc5749 Merge "Revert "Include proguard flag files from transitive java_library deps"" am: ed8b52ca27
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2362567

Change-Id: Ic6a2bf9fccc1fda90d1fdaa7bba120f8690a3ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17 04:07:30 +00:00
Treehugger Robot
2731ca8377 Merge "Allow adding extra tradefed options in the Android.bp file" 2022-12-17 03:40:01 +00:00
Colin Cross
ed8b52ca27 Merge "Revert "Include proguard flag files from transitive java_library deps"" 2022-12-17 03:15:36 +00:00
Colin Cross
6f7e288fb5 Revert "Include proguard flag files from transitive java_library deps"
This reverts commit 9c54f032b9.

Reason for revert: b/262940536

Bug: b/262940536
Change-Id: I8140eacc7ca8716f799561412cb5cef29df35d29
2022-12-17 03:15:22 +00:00
Treehugger Robot
f422d94b19 Merge "Include proguard flag files from transitive java_library deps" am: c1260dd095 am: 0edced0f95
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095983

Change-Id: I92ff1e1483ed537fd8752b979a42f4dcc7b8b674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17 02:39:26 +00:00
Treehugger Robot
0edced0f95 Merge "Include proguard flag files from transitive java_library deps" am: c1260dd095
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095983

Change-Id: Ia4cb373da959c44c490e9364c9fd65620f2fa152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17 02:03:32 +00:00
Treehugger Robot
c1260dd095 Merge "Include proguard flag files from transitive java_library deps" 2022-12-17 01:39:08 +00:00
Sasha Smundak
9c298ad440 Simplify soong_build top-level code am: 1845f42085 am: 554d061aea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2352003

Change-Id: I998874a59631e452514df663e0e02d0c58c934ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17 00:38:06 +00:00
Sasha Smundak
a01bac4a58 Keep all Soong command line arguments in a single structure am: af5ca926be am: 1cf3d473fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2347762

Change-Id: I1bbffe7e58d9c1cd9dc69aa4b1859f38a6e9bbba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17 00:36:58 +00:00
Sasha Smundak
554d061aea Simplify soong_build top-level code am: 1845f42085
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2352003

Change-Id: I6b2bff0c481bb3944443740df861c9b1ac26f639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17 00:06:06 +00:00
Sasha Smundak
1cf3d473fb Keep all Soong command line arguments in a single structure am: af5ca926be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2347762

Change-Id: I09b2e60e370b843da073ec7b9a601e7c6125dbc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17 00:05:46 +00:00
Jared Duke
9c54f032b9 Include proguard flag files from transitive java_library deps
Ensure proguard flag files specified by java_library targets propagate
to downstream targets. This matches bazel behavior, as well as
behavior for transitive android_library deps.

Bug: 212623640
Test: m + presubmit
Change-Id: I61abaf1fd43d6f06bb610383751bb26e9a1bafd6
2022-12-16 14:09:08 -08:00
Sasha Smundak
1845f42085 Simplify soong_build top-level code
* `android.Context` holds `android.Config`, so provide an accessor to it
  and avoid passing them separately to a lot of functions.
* factor common code in `readBazelPaths`/`getExistingBazelRelatedFiles`
  into `readFileLines`
* refactor check-error-and-quit into `maybeQuit`
* use switch instead of if-elseif-... where appropriate
* rearrange the code in `runApiBp2build`, `runSymlinkForestCreation`

Test: treehugger
Change-Id: I639929c21ec4999cdfd737c07136f32df2d488bc
2022-12-16 11:03:17 -08:00
Sasha Smundak
af5ca926be Keep all Soong command line arguments in a single structure
Define a structure android.CmdArgs and keep all soong_build command line
arguments used to build a configuration in it. Some of them related to BazelMode
were previously kept in Blueprint's bootstrap.Args where they do not belong.
This simplifies the code and lays the gound work for future simplifying changes.

Test: treehugger
Change-Id: I995871f4e6b0e95cc9df65696ad2020df221d8c8
2022-12-16 11:02:12 -08:00
Cole Faust
705968d043 Allow exporting bazel mixed build allowlists to simple text files
So that they the allowlists can be read from build_mainline_modules_bundles.sh.

Bug: 262302253
Test: m out/soong/bazel_prod_mixed_builds_enabled_list.txt out/soong/bazel_staging_mixed_builds_enabled_list.txt && cat out/soong/bazel_prod_mixed_builds_enabled_list.txt && echo && cat out/soong/bazel_staging_mixed_builds_enabled_list.txt
Change-Id: Id5f89ebb651a52dc5368681a20d6183703e05bd4
2022-12-15 15:40:36 -08:00
Treehugger Robot
59df41182b Merge "Enable -Wno-xor-as-pow for external code." am: 841fc797c1 am: 682e539cef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2356123

Change-Id: I6ec88b059aa92ec8ab2d17ec375275d74158f7f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 23:18:19 +00:00
Sam Delmerico
9842311bd8 Merge "bp2build disable malloc-rss-benchmark" am: 484fb0907d am: 99a1fac6f4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2358899

Change-Id: I1f516981d810cfef167ff5f89e60fe0de61b9f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 23:17:56 +00:00
Treehugger Robot
682e539cef Merge "Enable -Wno-xor-as-pow for external code." am: 841fc797c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2356123

Change-Id: I2457a10d9a1f4d81b6d263d4f1a6ff76b35874f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 22:44:47 +00:00
Sam Delmerico
99a1fac6f4 Merge "bp2build disable malloc-rss-benchmark" am: 484fb0907d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2358899

Change-Id: I133012196477d3c02a11d858d4d53a4660dd16b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 22:44:36 +00:00
Treehugger Robot
841fc797c1 Merge "Enable -Wno-xor-as-pow for external code." 2022-12-15 22:21:35 +00:00
Sam Delmerico
484fb0907d Merge "bp2build disable malloc-rss-benchmark" 2022-12-15 22:04:15 +00:00
Treehugger Robot
315f837146 Merge "Allowlist build files in external/python/absl-py" am: a6d4e15c3a am: 20bcc8ce1b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2323093

Change-Id: Icc736e30f8ec2ef206e6e10949929afcbd5fa73a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 21:20:08 +00:00
Treehugger Robot
20bcc8ce1b Merge "Allowlist build files in external/python/absl-py" am: a6d4e15c3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2323093

Change-Id: Ib00293597d0484ce38d002aae483f33d5d8f0109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 20:47:19 +00:00
Treehugger Robot
a6d4e15c3a Merge "Allowlist build files in external/python/absl-py" 2022-12-15 20:23:35 +00:00
Paul Crowley
95f9231762 Merge "Fix go link given when stubby is absent." am: e7e9e09128 am: ede2efc88f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2320299

Change-Id: I2b59855ffdf81d3a4588b3fb64eebc0d9fe8b23a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 19:21:41 +00:00
Treehugger Robot
93d67b11e1 Merge "Add Soong test to verify runtime_deps doesn't have afdo variant" am: 0bf1ff9fe1 am: d29a48311b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2328237

Change-Id: Icd6eaa1e2e6009fc4bf1618f72b830c5e7aee49d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 19:20:20 +00:00
Paul Crowley
ede2efc88f Merge "Fix go link given when stubby is absent." am: e7e9e09128
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2320299

Change-Id: I43119bcf8e25548af26644c49f916d56dfbe7901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 18:49:01 +00:00
Treehugger Robot
d29a48311b Merge "Add Soong test to verify runtime_deps doesn't have afdo variant" am: 0bf1ff9fe1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2328237

Change-Id: Iecaf36b3e0c2781a63e8e6290bd7d7d74987f4fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 18:47:56 +00:00
Paul Crowley
e7e9e09128 Merge "Fix go link given when stubby is absent." 2022-12-15 18:42:59 +00:00