Commit Graph

60154 Commits

Author SHA1 Message Date
Treehugger Robot
8abe2b3242 Merge "Put base APK when AppSet is included in APEX" am: b5a04d7905 am: 361cfb2309 am: 8c15660653
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2238204

Change-Id: I83f83b511fb6c84ea46fc6b8a559e25aa00ffad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 05:19:12 +00:00
Treehugger Robot
8c15660653 Merge "Put base APK when AppSet is included in APEX" am: b5a04d7905 am: 361cfb2309
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2238204

Change-Id: Id89398505a32b4800fa116d87aea76695f49ceb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 04:47:54 +00:00
Treehugger Robot
316f1aa8cc Merge "rust: Don't propagate apex across customBindgenTag" am: f99087d6d7 am: bc02032291 am: 577c476339
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2237042

Change-Id: I32bafe07c02d815da3aba0a9c5a47ddb3a3d07eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 04:20:14 +00:00
Treehugger Robot
361cfb2309 Merge "Put base APK when AppSet is included in APEX" am: b5a04d7905
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2238204

Change-Id: I1340c069254c0de05fbb98ee0afd29f21608bdb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 04:17:44 +00:00
Treehugger Robot
577c476339 Merge "rust: Don't propagate apex across customBindgenTag" am: f99087d6d7 am: bc02032291
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2237042

Change-Id: I8bc3496103ea43b41e22e6d5bfc0e41a4bb3614c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 03:51:54 +00:00
Treehugger Robot
b5a04d7905 Merge "Put base APK when AppSet is included in APEX" 2022-09-30 03:44:21 +00:00
Treehugger Robot
bc02032291 Merge "rust: Don't propagate apex across customBindgenTag" am: f99087d6d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2237042

Change-Id: Ia1844758032566b31d5ca4ceb9d2f6d603c9301f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 03:21:39 +00:00
Treehugger Robot
f99087d6d7 Merge "rust: Don't propagate apex across customBindgenTag" 2022-09-30 02:47:01 +00:00
Florian Mayer
ea27624307 Merge "[MTE] unset colliding sanitizers for mutators" am: a58d01da03 am: f9941447e7 am: cc61685fba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2238477

Change-Id: Iea6ecb9287a9dba5100bde2fc1b87e88d5756f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 02:25:58 +00:00
Florian Mayer
cc61685fba Merge "[MTE] unset colliding sanitizers for mutators" am: a58d01da03 am: f9941447e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2238477

Change-Id: I0f11de2db9b5a943217242dbf23836c8a9c77fc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 01:58:03 +00:00
Florian Mayer
f9941447e7 Merge "[MTE] unset colliding sanitizers for mutators" am: a58d01da03
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2238477

Change-Id: I41830ef3fcffacffd5c7ad5b358f5cefcbd0005a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 01:27:04 +00:00
Florian Mayer
a58d01da03 Merge "[MTE] unset colliding sanitizers for mutators" 2022-09-30 01:07:19 +00:00
Treehugger Robot
5a600b245c Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/soong" am: c63b7cf88e am: da855acdbc am: 748d961844
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2237377

Change-Id: I900d9ca07fd6a40a42c1ee22c070f3ef31fa1ce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 01:02:18 +00:00
Treehugger Robot
748d961844 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/soong" am: c63b7cf88e am: da855acdbc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2237377

Change-Id: I2b9e21dbe7c9f687c050a40644a59496b8fe3907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 00:33:51 +00:00
Treehugger Robot
da855acdbc Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/soong" am: c63b7cf88e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2237377

Change-Id: I1f09b94a3a5f6903f497b886a6f18611a3f471ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 00:02:50 +00:00
Matthew Maurer
581b6d82ab rust: Don't propagate apex across customBindgenTag
customBindgenTag is used to describe a particular host tool - don't
propagate apex dependency across it.

Bug: 249849807
Test: Adding rusqlite to apex no longer requires bindgen allowed
Change-Id: Ifcb2a94c577c72558f757bf10e975212558fe790
2022-09-29 16:46:25 -07:00
Treehugger Robot
c63b7cf88e Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/soong" 2022-09-29 23:34:23 +00:00
Florian Mayer
1bda246235 [MTE] unset colliding sanitizers for mutators
Bug: 174878242
Test: m device-tests with SANITIZE_TARGET=memtag_stack
Change-Id: Ia8659a90c6c1efd9109324e6c46748b434cbfd24
2022-09-29 15:49:46 -07:00
Treehugger Robot
fce895b093 Merge "Make writing command-line arguments as a comment in the generated file optional" am: 7ea3a82480 am: b190f5910e am: dfef13882b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2221302

Change-Id: Ib830a8f7a026cd57517ed6652e5bdecf6b828b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 19:44:18 +00:00
Treehugger Robot
dfef13882b Merge "Make writing command-line arguments as a comment in the generated file optional" am: 7ea3a82480 am: b190f5910e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2221302

Change-Id: I59e6413f3e518c83395bdd8a50d93ef96c1a0f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 19:05:58 +00:00
Treehugger Robot
b190f5910e Merge "Make writing command-line arguments as a comment in the generated file optional" am: 7ea3a82480
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2221302

Change-Id: Ic0f9397c5d6e171790ebb1d9bb0efcb6a40576e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 18:22:52 +00:00
Treehugger Robot
7ea3a82480 Merge "Make writing command-line arguments as a comment in the generated file optional" 2022-09-29 17:49:36 +00:00
Bob Badour
1825cb03a2 [LSC] Add LOCAL_LICENSE_KINDS to build/soong
Added SPDX-license-identifier-Apache-2.0 to:
  python/tests/dont_import_folder_of_entrypoint/Android.bp
  python/tests/top_level_dirs/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I7a1ea160c685361318f9a8543e10b83eeb9dcb7f
2022-09-29 10:18:32 -07:00
Christopher Parsons
78f97c406a Merge "Support main repository prefixing in cquery" am: 6378c05029 am: a3a6388957 am: b3f00e07ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2236422

Change-Id: Ib4f7c6c214b3e638ea26e34dd98c3ac33c1b0f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 16:45:28 +00:00
Christopher Parsons
7294b8aa9d Merge "Set bazel's HOME to an absolute path." am: e26a76728e am: d4df0aeb48 am: 4218a98ea9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2236423

Change-Id: I698ec0d117cb7207e54176b107c33fe496977ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 16:44:09 +00:00
Christopher Parsons
b3f00e07ac Merge "Support main repository prefixing in cquery" am: 6378c05029 am: a3a6388957
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2236422

Change-Id: I0ce1497adecae8357e2925dfc2582298b34d2e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 16:15:55 +00:00
Christopher Parsons
4218a98ea9 Merge "Set bazel's HOME to an absolute path." am: e26a76728e am: d4df0aeb48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2236423

Change-Id: I967a37a82ad4bd66730f1697e15739be277ec1f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 16:15:26 +00:00
Christopher Parsons
a3a6388957 Merge "Support main repository prefixing in cquery" am: 6378c05029
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2236422

Change-Id: If7d9ea8d3f50f1bac399c103759f6c44fbec9420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 15:43:44 +00:00
Christopher Parsons
d4df0aeb48 Merge "Set bazel's HOME to an absolute path." am: e26a76728e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2236423

Change-Id: Iab629352f9fe150edd63adb657831be519748e95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 15:43:10 +00:00
Christopher Parsons
6378c05029 Merge "Support main repository prefixing in cquery" 2022-09-29 15:21:22 +00:00
Christopher Parsons
e26a76728e Merge "Set bazel's HOME to an absolute path." 2022-09-29 15:20:55 +00:00
Jiyong Park
4169a25f54 Put base APK when AppSet is included in APEX
This change fixes a bug that base APK of an AppSet is not put into the
APEX.

Bug: 236299724
Test: m nothing
Change-Id: I1010ec66d8551fcc1e2d9119be7ecdba22186607
2022-09-29 21:30:25 +09:00
Paul Duffin
8020f9d4cc Merge "java_sdk_library_import: Copy all prebuilt properties to child modules" am: a3be747e5d am: f2e2061178 am: aa27eed62a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2234128

Change-Id: Id4be434fd1ecbbd429021c83a6ef5097a1530f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 11:56:32 +00:00
Paul Duffin
aa27eed62a Merge "java_sdk_library_import: Copy all prebuilt properties to child modules" am: a3be747e5d am: f2e2061178
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2234128

Change-Id: I633f9b9fc58abee1a8669b0e74fdbd32bdf58833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 11:27:25 +00:00
Paul Duffin
f2e2061178 Merge "java_sdk_library_import: Copy all prebuilt properties to child modules" am: a3be747e5d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2234128

Change-Id: I42eea95f76436ec89aca105aac608b0d35c519aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 10:57:04 +00:00
Paul Duffin
a3be747e5d Merge "java_sdk_library_import: Copy all prebuilt properties to child modules" 2022-09-29 10:28:41 +00:00
Treehugger Robot
f209f47cc8 Merge "Add bp2build converter for bpf" am: fba6f7797c am: f41f1b7fd9 am: e4a67bef05
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2217213

Change-Id: Ia7ca2dbfcbe22066ae232ae0c169b86c4f926257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 05:05:21 +00:00
Treehugger Robot
e4a67bef05 Merge "Add bp2build converter for bpf" am: fba6f7797c am: f41f1b7fd9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2217213

Change-Id: Ib0174064d6df57af9ec1a4433a0e583e915f4a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 04:21:06 +00:00
Treehugger Robot
f41f1b7fd9 Merge "Add bp2build converter for bpf" am: fba6f7797c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2217213

Change-Id: I286855d40104ae27cb0f29d0f8755d2ef3a6881a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 03:49:15 +00:00
Treehugger Robot
fba6f7797c Merge "Add bp2build converter for bpf" 2022-09-29 03:04:46 +00:00
Zi Wang
b3cb38c3c8 Add bp2build converter for bpf
Bug: 240163393
Test: m bp2build
Test: bp2build/bpf_conversion_test.go
Change-Id: Ie3bbc64511146b099a766d7e8b56e93cef58ef68
2022-09-28 14:18:45 -07:00
Chris Parsons
a9bef14e8d Set bazel's HOME to an absolute path.
Bazel at HEAD has a bug which causes Bazel to crash when HOME is set to
a relative path. We circumvent this bug by specifying an absolute path.

Also added some documentation on the significance of setting this HOME
value.

Bug: 248104019
Test: Presubmits
Test: Verified `m --bazel-mode-dev nothing` continues to pass with Bazel@HEAD
Change-Id: Id05c8dc322c8cca04f3d1caf44f5b04ffa96fd3b
2022-09-28 21:12:12 +00:00
Sam Delmerico
615771fe1f Merge "document workaround test_bp2build_generates_all_buildfiles" am: a0124bb13d am: faf8326842 am: 24b3cc5902
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2227497

Change-Id: I8ac27caa668a5f885f1419038a58896dbb562c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 20:46:58 +00:00
Sam Delmerico
24b3cc5902 Merge "document workaround test_bp2build_generates_all_buildfiles" am: a0124bb13d am: faf8326842
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2227497

Change-Id: Ic896b3d3cd1bb8ae37e005400cbf61f600f8be9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 20:12:37 +00:00
Treehugger Robot
d6e4038c0e Merge "Allowlist more deps of minadbd." am: d15df3269c am: 32e28a68d9 am: b220f72770
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2236113

Change-Id: Ieeb23a7a9faa12c88d759ca91f3b481ccbf68724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 19:42:33 +00:00
Sam Delmerico
faf8326842 Merge "document workaround test_bp2build_generates_all_buildfiles" am: a0124bb13d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2227497

Change-Id: Ic5f49234cf0a28f1bd27575f20450d3b3c3d8885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 19:39:17 +00:00
Sam Delmerico
a0124bb13d Merge "document workaround test_bp2build_generates_all_buildfiles" 2022-09-28 19:09:16 +00:00
Chris Parsons
86dc2c268a Support main repository prefixing in cquery
This makes mixed builds resilient to a recent backward-incompatbile
Bazel feature which explicitly adds the main repository (`@`) prefix to
all labels which are stringified by `str(target.label)` in Starlark.

This implementation is compatible with both current Bazel and
Bazel@HEAD.

After a new Bazel release to AOSP, we can clean up this code a little to
only support Bazel with this feature active (and that we need not hedge
on either Bazel behavior).

Bug: 248106697
Test: `m --bazel-mode nothing` with both current Bazel and a new Bazel
Change-Id: Id53c8505bb9080d5073c844de7f1ee57ceceae46
2022-09-28 19:02:51 +00:00
Treehugger Robot
b220f72770 Merge "Allowlist more deps of minadbd." am: d15df3269c am: 32e28a68d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2236113

Change-Id: Ib1d7b6f52b574c290c064484aeccb031da160d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 19:01:37 +00:00
Treehugger Robot
32e28a68d9 Merge "Allowlist more deps of minadbd." am: d15df3269c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2236113

Change-Id: Ic5970231153b0c8004a0be29f802dafb78d0ac6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 18:29:21 +00:00