Commit Graph

56046 Commits

Author SHA1 Message Date
Sam Delmerico
dc459dc9c1 Merge changes I8e4c3f37,I89a32bde am: 3c25ab1ac3 am: a2db166241 am: fd13aac77a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032106

Change-Id: I320fc8b4385337497d684399e6f6b0c54084f8ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 22:07:11 +00:00
Treehugger Robot
5d123b15d9 Merge changes from topic "no-srcs-no-deps" am: d93afba1e6 am: d218781011 am: beb28cd9ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995730

Change-Id: I8c8c7b973ffc6a6dfd91c35dc96e73c42bf30577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 22:07:01 +00:00
Sam Delmerico
fd13aac77a Merge changes I8e4c3f37,I89a32bde am: 3c25ab1ac3 am: a2db166241
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032106

Change-Id: Ibe7c1a290934a9992009946d51dc0b6cc31df235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:45:45 +00:00
Treehugger Robot
beb28cd9ad Merge changes from topic "no-srcs-no-deps" am: d93afba1e6 am: d218781011
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995730

Change-Id: I61f076d3e872e90b9375cd6fee2639863dd016cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:45:36 +00:00
Sam Delmerico
a2db166241 Merge changes I8e4c3f37,I89a32bde am: 3c25ab1ac3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032106

Change-Id: Ic058bec1f52af235e047c1d96aaf8624f1e6e454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:29:23 +00:00
Treehugger Robot
d218781011 Merge changes from topic "no-srcs-no-deps" am: d93afba1e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995730

Change-Id: Ibde8e40e3b7f704aee45c32b0c922c3178cbadf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:28:59 +00:00
Sam Delmerico
3c25ab1ac3 Merge changes I8e4c3f37,I89a32bde
* changes:
  add plugins to javaLibraryAttributes
  convert java_import_host with bp2build; enable jetifier
2022-03-30 21:08:12 +00:00
Treehugger Robot
d93afba1e6 Merge changes from topic "no-srcs-no-deps"
* changes:
  enable conversion of all java_import modules
  emulate java_library static_deps with Bazel exports
2022-03-30 21:06:46 +00:00
Treehugger Robot
dfab76d1ac Merge "analyze_bcpf: Compute hidden_api package properties" am: 91dac89447 am: c17a61f6f6 am: ee99468ff2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034243

Change-Id: Ib1608a94d4a185e2b86c157f27970c74c0a2a0a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:44:33 +00:00
Cole Faust
95d500cd04 Merge "Always build mk2rbc/rbcrun" am: 71350eaff2 am: 460e1a5a6b am: b6d282af41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044703

Change-Id: Ie4d1689c77e60955468203aeef5ff1e487eb9713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:44:03 +00:00
Treehugger Robot
ee99468ff2 Merge "analyze_bcpf: Compute hidden_api package properties" am: 91dac89447 am: c17a61f6f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034243

Change-Id: I8378c6c42501ef831c95f1c58cae9833db7090b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:21:06 +00:00
Cole Faust
b6d282af41 Merge "Always build mk2rbc/rbcrun" am: 71350eaff2 am: 460e1a5a6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044703

Change-Id: Iedfdfc0af749dadab1904b7371483bf566af7b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:20:43 +00:00
Treehugger Robot
c17a61f6f6 Merge "analyze_bcpf: Compute hidden_api package properties" am: 91dac89447
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034243

Change-Id: I3bd821f1daa1b78b428bf4a9f455beb1f46008fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:19:02 +00:00
Treehugger Robot
91dac89447 Merge "analyze_bcpf: Compute hidden_api package properties" 2022-03-30 20:00:43 +00:00
Cole Faust
460e1a5a6b Merge "Always build mk2rbc/rbcrun" am: 71350eaff2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044703

Change-Id: If4e0039a97c0927fc75e9598af8de2d774883354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 19:56:04 +00:00
Cole Faust
71350eaff2 Merge "Always build mk2rbc/rbcrun" 2022-03-30 19:43:06 +00:00
Sam Delmerico
77267c7d9c add plugins to javaLibraryAttributes
Test: go test ./bp2build
Change-Id: I8e4c3f373c62c60ea5013cd8c585915a366c1f81
2022-03-30 19:19:13 +00:00
Sam Delmerico
5f83b491b4 convert java_import_host with bp2build; enable jetifier
Also, add java_imports that were blocked by jetifier binary.
b/221082840 was blocking the build of jetifier which these java_imports
depended on. That bug is now resolved, so we can unblock these targets.

Bug: 220168131
Test: b build //packages/apps/Car/libs/car-ui-lib/car-ui-androidx/...
Test: build/bazel/ci/bp2build.sh
Change-Id: I89a32bde30c133a44aeb7826afa11d4140433f5d
2022-03-30 19:19:13 +00:00
Sam Delmerico
a9b047a9da enable conversion of all java_import modules
Bug: 220168131
Test: b build '...'
Change-Id: Ib1eaf47b81ac19cb6e930e5f9f3fc2aebe02b0c1
2022-03-30 19:19:09 +00:00
Sam Delmerico
c016143602 emulate java_library static_deps with Bazel exports
In Soong, java_library can specify static_deps which are dependencies
that get aggregated into the final jar (akin to static linking). This is
useful because it allows dependencies higher up in the chain to compile
against the APIs exported by transitive dependencies. Bazel does not
support this functionality directly, but it can be emulated via the
exports attribute which makes any targets listed in the attribute public
to targets further up the chain.

Bug: 217236083
Bug: 219908977
Test: b build //external/error_prone:error_prone_core
Test: b build //external/bouncycastle:bouncycastle-host
Test: b build --platforms=//build/bazel/platforms:linux_x86
  //prebuilts/sdk/tools/jetifier/jetifier-standalone:jetifier
Change-Id: I2867e3f816de720a6f4bd9ff7a847d1b0c2da2d6
2022-03-30 18:58:38 +00:00
Paul Duffin
a3722954ea analyze_bcpf: Add --fix option am: 26f19919ea am: 37a95341d9 am: 953b1dfc41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047416

Change-Id: I722447c1e2d806b55bf98abcfbfa9feec05a09e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 18:29:30 +00:00
Paul Duffin
953b1dfc41 analyze_bcpf: Add --fix option am: 26f19919ea am: 37a95341d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047416

Change-Id: I23ae9e0208e5297f8b9297039e79499b4796c31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 18:05:32 +00:00
Paul Duffin
37a95341d9 analyze_bcpf: Add --fix option am: 26f19919ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047416

Change-Id: I74d07bf3a24e0d8c02262efcc44b9c1e2fc9772f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 17:45:44 +00:00
Paul Duffin
ff489b61c5 Add analyze_bcpf.py script to help manage bootclasspath_fragments am: 4dcf65951b am: a87d148823 am: 04c32d2b98
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2020741

Change-Id: I0a46883c16ebaf59fcf30437c592bf1ca9823102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 16:07:05 +00:00
Paul Duffin
04c32d2b98 Add analyze_bcpf.py script to help manage bootclasspath_fragments am: 4dcf65951b am: a87d148823
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2020741

Change-Id: Ifdbd09d2ccae7cc0beb57b12e037a7edc409da34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 15:43:48 +00:00
Paul Duffin
a87d148823 Add analyze_bcpf.py script to help manage bootclasspath_fragments am: 4dcf65951b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2020741

Change-Id: I92c0a9d5b9d63abf04af465840ff6f0d13ef03e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 15:20:18 +00:00
Paul Duffin
dd97fd2520 analyze_bcpf: Compute hidden_api package properties
Analyzes the signatures of the class members contained within the
bootclasspath_fragment to construct the split_packages,
single_packages and package_prefixes hidden_api properties that are
necessary to remove the internal implementation details from the
hidden API flags.

Bug: 202154151
Test: m analyze_bcpf && analyze_bcpf --bcpf art-bootclasspath-fragment
      m analyze_bcpf && analyze_bcpf --bcpf art-bootclasspath-fragment --fix
      m analyze_bcpf && analyze_bcpf --bcpf com.android.mediaprovider-bootclasspath-fragment --fix
      atest --host analyze_bcpf_test
Change-Id: I4a8e5a8bfee2a44775e714b9226cd4a7382e0123
2022-03-30 16:00:08 +01:00
Paul Duffin
26f19919ea analyze_bcpf: Add --fix option
Add a --fix option that will cause the script to automatically fix the
issues that it finds. It uses the bpmodify tool to add values to the
bootclasspath_fragment's hidden_api properties.

This adds analyze_bcpf to bp2buildModuleDoNotConvertList as
analyze_bcpf depends on bpmodify which is a blueprint_go_binary which
is not yet supported by bazel.

Bug: 202154151
Test: m analyze_bcpf && analyze_bcpf --bcpf art-bootclasspath-fragment
      m analyze_bcpf && analyze_bcpf --bcpf art-bootclasspath-fragment --fix
      atest --host analyze_bcpf_test

Change-Id: I5ee52419b4829474f6dbeb47f86ab2aeb22b1382
2022-03-30 16:00:08 +01:00
Paul Duffin
4dcf65951b Add analyze_bcpf.py script to help manage bootclasspath_fragments
The analyze_bcpf.py script can be used by bootclasspath_fragment owners
to help setup their fragment and also to debug issues that arise during
use.

It is run by specifying the name of the bootclasspath_fragment module
in the --bcpf option. If specified the --apex and --sdk options will
allow the tool to produce more helpful messages.

The script currently:
* Builds out/soong/hiddenapi/hiddenapi-stub-flags.txt and checks any
  inconsistencies between those flags and the flags generated for the
  bootclasspath_fragment.

* Builds out/soong/hiddenapi/hiddenapi-flags.csv and checks any
  inconsistencies between those flags and the flags generated for the
  bootclasspath_fragment. It will describe the changes that need to
  be made in order to fix any inconsistencies in the flags.

Bug: 202154151
Test: m analyze_bcpf && analyze_bcpf --bcpf art-bootclasspath-fragment
      atest --host analyze_bcpf_test
Change-Id: I824fd9d527d246dfe56725c073d89a0b0e72d25a
2022-03-30 12:18:56 +01:00
Colin Cross
652dbcaa9a Merge changes from topic "musl_clang_runtimes" am: 0f2a718ce4 am: e3f28d26a6 am: c068a7d423
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980450

Change-Id: I45f717f96780715af04c0c4eef61bd4db763cc63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:51:05 +00:00
Colin Cross
a152356349 Switch to libunwind to remove dependency on libgcc for musl am: 441898c285 am: b7ea2f5c7e am: d1b5f338e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1983628

Change-Id: I015e1b22dbcc2dbfdd9c2eb053d8ae94bfd8fcd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:51:00 +00:00
Colin Cross
c068a7d423 Merge changes from topic "musl_clang_runtimes" am: 0f2a718ce4 am: e3f28d26a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980450

Change-Id: I7e197d725c670fbf0e33156549d33af2cc028b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:29:43 +00:00
Colin Cross
d1b5f338e5 Switch to libunwind to remove dependency on libgcc for musl am: 441898c285 am: b7ea2f5c7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1983628

Change-Id: I4a19e594ee501b2fc88eccd235eb9538930c4bf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:29:38 +00:00
Colin Cross
e3f28d26a6 Merge changes from topic "musl_clang_runtimes" am: 0f2a718ce4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980450

Change-Id: I89cabdde43dea0e5b2505f09d80d67356484433e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:11:59 +00:00
Colin Cross
b7ea2f5c7e Switch to libunwind to remove dependency on libgcc for musl am: 441898c285
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1983628

Change-Id: I1520b92b0fa7a3266915cd20dd45019df761a849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:11:55 +00:00
Treehugger Robot
94f6610eb7 Merge "android_system_image only packages "system" items" am: 0cfe1f43f7 am: 578ea8d076 am: db0478589e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030223

Change-Id: I95ddce4b6b8c9d4b620ef1b3548d8da31d3ab609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 03:56:15 +00:00
Colin Cross
0f2a718ce4 Merge changes from topic "musl_clang_runtimes"
* changes:
  Enable sanitizers for musl
  Switch to libunwind to remove dependency on libgcc for musl
2022-03-30 03:54:38 +00:00
Treehugger Robot
db0478589e Merge "android_system_image only packages "system" items" am: 0cfe1f43f7 am: 578ea8d076
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030223

Change-Id: I6f04476705efce0fa6f1f7edc7a228722bdb878b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 03:35:26 +00:00
Treehugger Robot
578ea8d076 Merge "android_system_image only packages "system" items" am: 0cfe1f43f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030223

Change-Id: Icd1602f08035e2c6eea39eacc0cf448a6b04fe31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 03:18:17 +00:00
Treehugger Robot
0cfe1f43f7 Merge "android_system_image only packages "system" items" 2022-03-30 02:58:58 +00:00
Rob Seymour
aafaf3adff Add pre-built attribute to host module definition for fake snapshot. am: 9e5cc8a674 am: d7e3a12438 am: 226b5f4589
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044967

Change-Id: I1cf825ac4998edfc3fb676f5965983a47da951d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 01:49:43 +00:00
Rob Seymour
226b5f4589 Add pre-built attribute to host module definition for fake snapshot. am: 9e5cc8a674 am: d7e3a12438
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044967

Change-Id: Iaa4355b0d76329c47b6370f855a8cbd0650a1d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 01:25:33 +00:00
Rob Seymour
d7e3a12438 Add pre-built attribute to host module definition for fake snapshot. am: 9e5cc8a674
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044967

Change-Id: Iadd0cc05e885f2b39156aa1446bd55e2d1cea555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 01:06:53 +00:00
Cole Faust
d9932ad053 Always build mk2rbc/rbcrun
Currently, mk2rbc/rbcrun aren't built in certain phases
of the build, which causes the Starlark product configuration
to fail when using get_build_var if a regular build hasn't
been run before.

Bug: 226677850
Test: Manually
Change-Id: If85608eef63be25fddc4d916c82247c13eb0195f
2022-03-29 14:55:17 -07:00
Colin Cross
441898c285 Switch to libunwind to remove dependency on libgcc for musl
The libgcc dependency is only used for _Unwind* symbols, remove
it now that libc_musl.so embeds libunwind.a.

Bug: 215802826
Test: m USE_HOST_MUSL=true host-native
Change-Id: I1ad4c1435fc0090c6df2d50d542d2203dfb94d7b
2022-03-29 13:35:17 -07:00
Colin Cross
ed12a04a3e Enable sanitizers for musl
Now that we provide runtimes built for musl, enable the sanitizers
when targeting musl.

Bug: 215802826
Test: m USE_HOST_MUSL=true host-native
Change-Id: Id17513ee305274874c31e9c99ce4faeff4a1c057
2022-03-29 13:35:17 -07:00
Rob Seymour
9e5cc8a674 Add pre-built attribute to host module definition for fake snapshot.
The host-snapshot provides host tools via prebuilt modules.
Having 2 prebuilts of the same module in a source tree leads to a build
time error.   Add new attribute when building the fake snapshot to
indicate that the host tool contains a prebuilt version.

When installing the host snapshot the user can opt not to include
modules that have a prebuilt version.

Bug: 225890931
Test: m HOST_FAKE_SNAPSHOT_ENABLE=true host-fake-snapshot dist
Change-Id: I044a92a280536f9c5ec93dcb277a5e5568cc4e42
2022-03-29 16:08:43 +00:00
Ram Muthiah
e907043def Merge changes from topic "refactor-packagingbase" am: ac38c0bb93 am: ad2c724bb7 am: 314e72ab6a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2033505

Change-Id: Ibb88bda311be1ace7adcd7d972f343ec648a61bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:31:02 +00:00
Ivan Lozano
a9a8f26255 Merge "rust: rust_proc_macro host snapshot support." am: 72cbf5888b am: 77218bb2ae am: 06de3f94b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042225

Change-Id: Ifcde1fb932aaddbf6e14d659d3a969ddbf7d8522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:30:46 +00:00
Treehugger Robot
fc676d3bb0 Merge "Add values to json module graph" am: 4242115d59 am: 9fadff9a6b am: feda277e91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2036896

Change-Id: I5368019447475cab2cac78ecb912515d17355834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:30:34 +00:00