Commit graph

4189 commits

Author SHA1 Message Date
Liz Kammer
a1b33112b1 Merge "Export variant/features via soong_injection" am: 6e4cd27bec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2000396

Change-Id: I6da248db7bca983d0ce5b121412f904e48f67a21
2022-03-03 18:36:17 +00:00
Liz Kammer
6e4cd27bec Merge "Export variant/features via soong_injection" 2022-03-03 18:11:25 +00:00
Treehugger Robot
9688f00e3a Merge "ensure out/bazel_metrics exists before writing to cquery-buildroot_bazel_profile.gz" am: 7ed6612fa6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2004236

Change-Id: I9401f672367864c89afdee750fa910f9ba217409
2022-03-02 22:42:16 +00:00
Treehugger Robot
7ed6612fa6 Merge "ensure out/bazel_metrics exists before writing to cquery-buildroot_bazel_profile.gz" 2022-03-02 22:14:16 +00:00
Usta Shrestha
902fd17a99 ensure out/bazel_metrics exists before writing to cquery-buildroot_bazel_profile.gz
Bug: 222133546
Test: `rm -rf out` then `USE_BAZEL_ANALYSIS m libnativehelper` and ensure 'out/bazel_metrics' exists
Change-Id: I6803aba830e1c40f3618bfc41109728d721fd2af
2022-03-02 15:27:49 -05:00
Liz Kammer
cda3d14ad8 Merge "Improve clarity of arch decoding." am: b3fe72fc78
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002771

Change-Id: Ibeb07556427c29a0d4a1a9b099b8c6b83783304a
2022-03-02 16:04:45 +00:00
Liz Kammer
b3fe72fc78 Merge "Improve clarity of arch decoding." 2022-03-02 15:44:26 +00:00
Liz Kammer
94ff96ed4b Merge "Disallow libc_musl_sysroot_libc++_headers" am: 6bd0d4e864
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2003473

Change-Id: I79b9cc64f14440ca63e26862c9b878741d555d2b
2022-03-01 19:28:27 +00:00
Liz Kammer
6bd0d4e864 Merge "Disallow libc_musl_sysroot_libc++_headers" 2022-03-01 19:10:16 +00:00
Liz Kammer
4f3b9f3d8d Merge "Restrict genrules to disallow directories as input" am: a98902955a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1965346

Change-Id: Iac0395f0fbb4736d7b7fabb662625866cb419498
2022-03-01 15:47:55 +00:00
Liz Kammer
a98902955a Merge "Restrict genrules to disallow directories as input" 2022-03-01 15:19:34 +00:00
Liz Kammer
878a7f1632 Disallow libc_musl_sysroot_libc++_headers
This depends on go modules and is musl specific, not a current focus.
Allows CI to be green again.

Test: bp2build.sh
Change-Id: I35520636b38eed3f829e176c4ba91517fd61364a
2022-03-01 09:08:23 -05:00
Liz Kammer
e8303bd0ae Export variant/features via soong_injection
Test: build/bazel/ci/bp2build.sh
Change-Id: If70043dc9d020d5f4a243ba4b192b99c9c7e8563
2022-02-28 14:17:15 -05:00
Liz Kammer
b7f3366cbb Improve clarity of arch decoding.
Test: CI
Change-Id: I31789f962259e917e99ac6f778644729199f42ed
2022-02-28 14:17:15 -05:00
Sam Delmerico
74bb39d1ca Merge "add a module-level allowlist to bp2build" am: b0b94f6182
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995210

Change-Id: I748ac9e97f1aeb2b67dbf3a74de9cc92d1ae9cf7
2022-02-25 15:40:46 +00:00
Sam Delmerico
fa1831c200 add a module-level allowlist to bp2build
We currently enabled modules in bp2build on a package level, and we
disable individual modules based on a denylist. To enable a specific
module individually, we must change the corresponding Android.bp file to
include a bp2build_available property. Instead, have a centralized list
of specifically enabled modules.

Bug: 220875679
Test: m bp2build
Change-Id: I908f2f2366b72affb04234fbe92ba03bf5a37338
2022-02-24 14:46:41 +00:00
Liz Kammer
619be4626b Restrict genrules to disallow directories as input
While Bazel genrules will allow genrules to accept a directory as input,
the results can be unexpected to a user as changes to the contents of
the directory may not trigger a rebuild as expected. Restricting this
in Soong ensures that converted targets will behave as expected.

Test: CI
Change-Id: I8616f58d1df267005e6c0ca3f4730d06de52c0d9
2022-02-23 21:29:22 +00:00
Treehugger Robot
e8815d5ebb Merge "Fix typos in arch_list and do variant validation" am: cda344f120
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1982666

Change-Id: Icfd76442021fbd278a386fb44dff5f21b2cec0b5
2022-02-23 17:55:48 +00:00
Treehugger Robot
cda344f120 Merge "Fix typos in arch_list and do variant validation" 2022-02-23 17:34:51 +00:00
Sam Delmerico
4dc3df7be7 Merge "convert java proto libraries with bp2build" am: bc83b504ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1975287

Change-Id: I8706280d13486f6e3b3f230e37af2d3052655ad0
2022-02-23 16:59:35 +00:00
Sam Delmerico
bc83b504ff Merge "convert java proto libraries with bp2build" 2022-02-23 16:13:15 +00:00
Treehugger Robot
119decff9b Merge "Move functionality to test install rules into testing.go." am: 489be090e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980966

Change-Id: I0911fa11b0ddac5235deb2effdf69650fb82a4ae
2022-02-22 21:14:18 +00:00
Treehugger Robot
489be090e7 Merge "Move functionality to test install rules into testing.go." 2022-02-22 20:41:23 +00:00
Treehugger Robot
16e222bc2a Merge "typos fixed" am: 92a21ddb41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1991433

Change-Id: Iddd5f8ee11f39262dfca8bf7ae6dceb083808170
2022-02-22 14:42:14 +00:00
Treehugger Robot
92a21ddb41 Merge "typos fixed" 2022-02-22 14:17:13 +00:00
Anton Hansson
df4ea086a4 Merge changes from topics "extdir", "threadvars" am: d2149e6a81
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1988355

Change-Id: I8b8360f24b65a8dbc6d8ad144271508772b46403
2022-02-22 14:10:16 +00:00
Anton Hansson
d2149e6a81 Merge changes from topics "extdir", "threadvars"
* changes:
  Add support for sdk extensions in prebuilt_apis
  Refactor prebuilt_apis.go
  Add base sdk extension version to the config
2022-02-22 13:46:47 +00:00
Usta Shrestha
0b52d83b60 typos fixed
Bug: N/A
Test: m nothing
Change-Id: Ia3abc4b9db2b811bf589447e32a7f29f341f2307
2022-02-18 22:19:12 -05:00
Colin Cross
6be81464b8 Merge "Add SortedStringValues and SortedUniqueStringValues" am: a00cb70910
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1990670

Change-Id: I68c03e568b8f821e4d2e8d0a851c4f064edb7634
2022-02-18 21:15:05 +00:00
Yu Liu
ea1aae2889 Merge "Enable cc_binary in mixed build." am: 9d7d9810e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1983488

Change-Id: I88bc7baa0db521b52be1a581c6d230d43287766a
2022-02-18 09:44:39 +00:00
Colin Cross
a00cb70910 Merge "Add SortedStringValues and SortedUniqueStringValues" 2022-02-18 03:39:10 +00:00
Colin Cross
9eb853bcf2 Add SortedStringValues and SortedUniqueStringValues
Add SortedStringValues and SortedUniqueStringValues that return the
values of a string-valued map.  Also make the SortedStringKeys
function use a similar implementation with MapRange, which avoids
iterating over the keys twice, once in MapKeys to build the list
of key reflect.Values and once over the reflect.Values to convert
them to strings.

Test: util_test.go
Change-Id: I4fc990a5036421e8926094ee158fafe606d0f10b
2022-02-17 15:52:07 -08:00
Yu Liu
9d7d9810e2 Merge "Enable cc_binary in mixed build." 2022-02-17 21:54:04 +00:00
Yu Liu
7f3605fee1 Enable cc_binary in mixed build.
Bug: 216114082
Test: Run mixed build on adbd apex and verify the pavkaged adbd binary;
add unit test.
Change-Id: Id11549a7952a7ce5ac02988b88b747bbfe8339ff

Change-Id: If01efe076c223886278f466b65628602bff3a964
2022-02-17 11:15:59 -08:00
Anton Hansson
97d0bae750 Add base sdk extension version to the config
So that it can be used by prebuilt_apis in follow-up CLs.

Bug: 220086085
Test: m nothing && inspect soong.variables
Change-Id: If987b8aef9802c52a751ea5351cab2a3df6f2e00
2022-02-17 11:17:21 +00:00
Treehugger Robot
37575bcc6d Merge "Add sepolicy prebuilt API dirs to soong config" am: 1d7209b820
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1984570

Change-Id: Ifc0ae37046368f91913231ccaca4b864638c42fe
2022-02-17 01:46:44 +00:00
Treehugger Robot
1d7209b820 Merge "Add sepolicy prebuilt API dirs to soong config" 2022-02-17 01:26:04 +00:00
Treehugger Robot
7eed46b65b Merge "Keep build/bazel/ci/dist/BUILD for bp2build." am: 632d0a03ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1976970

Change-Id: Ie155c4cb566de460825730b99a12a6b39f65f6fa
2022-02-16 16:30:33 +00:00
Treehugger Robot
632d0a03ed Merge "Keep build/bazel/ci/dist/BUILD for bp2build." 2022-02-16 16:14:26 +00:00
Jingwen Chen
41bd3efc00 Add error_prone_checkerframework_dataflow_nullaway. to bp2build denylist. am: eb2a3fd367
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1988326

Change-Id: I8d13f62cbc4cb2915895032d7b2f08f58af8c807
2022-02-16 15:49:23 +00:00
Jingwen Chen
eb2a3fd367 Add error_prone_checkerframework_dataflow_nullaway. to bp2build denylist.
Bug: 219908977
Change-Id: Ia6a0879d9af7aabadb5cd5722ddfdf72f579e621
Test: CI
2022-02-16 13:03:29 +00:00
Liz Kammer
2c2afe26ea Fix typos in arch_list and do variant validation
Test: m nothing
Change-Id: Icfbc9f886a1e16abe02bf6c61671b8187a699942
2022-02-15 17:26:35 -05:00
Sam Delmerico
c768102bce convert java proto libraries with bp2build
Allow java_libraries that depend on protobufs to be converted with
bp2build.

Bug: 215230097
Test: build/bazel/ci/bp2build.sh
Change-Id: I3ce52389e7e4e82755605ee277c1e527a6aebc6b
2022-02-15 21:04:59 +00:00
Liz Kammer
4902daf52f Merge "Correct bp2build canonical_from_root logic" am: 5ee913f527
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1985613

Change-Id: I374352d470b8d0e351de3b47d5a48f87d4ac40ab
2022-02-15 20:57:04 +00:00
Liz Kammer
5ee913f527 Merge "Correct bp2build canonical_from_root logic" 2022-02-15 20:43:57 +00:00
Liz Kammer
7756c8f20e Correct bp2build canonical_from_root logic
The logic was inverted from what it should have been,
canonical_from_root --> no strip_import_prefix attribute.

Test: build/bazel/ci/bp2build.sh
Test: build/bazel/ci/mixed_droid.sh
Change-Id: Ic6685d8f0b88279d4444bab3b5e03a544d225f77
2022-02-15 09:54:57 -05:00
Xin Li
91c585812c Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master 2022-02-14 17:30:12 +00:00
Inseob Kim
1a0afcc05b Add sepolicy prebuilt API dirs to soong config
Bug: 33691272
Test: build
Change-Id: Ia7e750ea9d172d81d2ce0bc330e4f7f149c6fdb8
2022-02-14 23:10:51 +09:00
Colin Cross
7b2e5cd134 Merge changes Ibd19d9a5,Icfc42ad7,Ieafdcceb
* changes:
  Fix musl clang triple
  Add musl_<arch> and glibc_<arch> properties
  Add libc_musl as a dependency of RuleBuilderCommand.BuiltTool
2022-02-11 23:09:27 +00:00
Treehugger Robot
fc70d4d2be Merge "Support multiple library names per target." 2022-02-11 22:17:17 +00:00