StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,733 Commits 1 Branch 0 Tags
c264f981d670d3c25eb0382be41ffe7a3dacda8f
Commit Graph

74733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
c264f981d6 Merge "Improve optimize bp2build conditional." into main am: 8559872623 am: 6c49c4a1d5 am: 36b815461a am: d75588773b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762806

Change-Id: I7b84a024363c10abe56a07f1c0069fd38f52f8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 19:05:00 +00:00
Treehugger Robot
d75588773b Merge "Improve optimize bp2build conditional." into main am: 8559872623 am: 6c49c4a1d5 am: 36b815461a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762806

Change-Id: I49e1754c9499d309c5b7e5f553400016c0d4c5cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 18:24:08 +00:00
Treehugger Robot
36b815461a Merge "Improve optimize bp2build conditional." into main am: 8559872623 am: 6c49c4a1d5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762806

Change-Id: Ib480e7bf5525173b01ae47846cd721e5c992fd3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 17:00:16 +00:00
Anton Hansson
84679dd2af Make package parsing code consume annotations am: 2863e4535e am: aeb979e000 am: 7ba5d61fde am: ad908b4efb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760406

Change-Id: I94aca80fecae8f99fb9828ec7e0a8b5c437ec7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 16:46:09 +00:00
Anton Hansson
ad908b4efb Make package parsing code consume annotations am: 2863e4535e am: aeb979e000 am: 7ba5d61fde 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760406

Change-Id: I1aaa861fcac61da6c0146834c63822ae307f2793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 16:04:05 +00:00
Treehugger Robot
6c49c4a1d5 Merge "Improve optimize bp2build conditional." into main am: 8559872623 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762806

Change-Id: I4493c3fbcfa9f42509cd8a641293eabe91ec8475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 15:59:55 +00:00
Treehugger Robot
8559872623 Merge "Improve optimize bp2build conditional." into main 2023-09-26 15:23:20 +00:00
Anton Hansson
7ba5d61fde Make package parsing code consume annotations am: 2863e4535e am: aeb979e000 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760406

Change-Id: Id3c3c16c0425a17357c94fecbb2642a43c1921be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 15:10:27 +00:00
Anton Hansson
aeb979e000 Make package parsing code consume annotations am: 2863e4535e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760406

Change-Id: I6441efbe49bd65f72d952bc8d65519dd2a286952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 14:11:39 +00:00
Anton Hansson
2863e4535e Make package parsing code consume annotations 
The code previously assumed an annotation meant there was no package
declaration, but package declarations can be annotated. Update the
code to consume any leading annotations.

Bug: 151360309
Test: jar_test.go (& manual verification on full bootclasspath srcs)
Change-Id: I3de5a2a675363fc3627a278103dd2cabe80a2d80
 2023-09-26 09:55:52 +00:00
Treehugger Robot
f5649b66fc Merge "Generate a ndk_sysroot target in bp2build" into main am: 370e34172f am: 354f87f135 am: 8de87e277e am: 47cb3481cc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756530

Change-Id: Ic3d4dce8fd931ac84e49392ac3fee797d0f4128d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 07:35:33 +00:00
Jingwen Chen
a21f382fd9 Allowlist system/core/libstats/expresslog am: c6f3c10615 am: e14b481913 am: 09d8de8b0d am: 023959e3c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762805

Change-Id: I5cd1bdece81657371c2ee76f57182059cfa9d153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 07:35:24 +00:00
Treehugger Robot
47cb3481cc Merge "Generate a ndk_sysroot target in bp2build" into main am: 370e34172f am: 354f87f135 am: 8de87e277e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756530

Change-Id: Ia76f1a002ae3ebfccc06971d23209883ca75f8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 06:53:48 +00:00
Jingwen Chen
023959e3c6 Allowlist system/core/libstats/expresslog am: c6f3c10615 am: e14b481913 am: 09d8de8b0d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762805

Change-Id: I73b1235b87eba7eb259154de9819066a48c64b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 06:53:39 +00:00
Treehugger Robot
8de87e277e Merge "Generate a ndk_sysroot target in bp2build" into main am: 370e34172f am: 354f87f135 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756530

Change-Id: I6db38df04de6335a912df9da0490bd4015f04776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 06:00:45 +00:00
Jingwen Chen
09d8de8b0d Allowlist system/core/libstats/expresslog am: c6f3c10615 am: e14b481913 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762805

Change-Id: I202c680c410c52acabe3c0dd8488d87d39abd0b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 06:00:19 +00:00
Jingwen Chen
256c389608 Improve optimize bp2build conditional. 
Follow up from https://android-review.git.corp.google.com/c/platform/build/soong/+/2757255/comment/fdcf5795_943a04d5/

Test: soong unit tests
Change-Id: I63334bfd19469060673e9a9a239050590934b089
 2023-09-26 05:56:54 +00:00
Treehugger Robot
354f87f135 Merge "Generate a ndk_sysroot target in bp2build" into main am: 370e34172f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756530

Change-Id: Icec90aea97b644dc76d16009c5132681b82b4d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 05:55:30 +00:00
Treehugger Robot
370e34172f Merge "Generate a ndk_sysroot target in bp2build" into main 2023-09-26 05:16:53 +00:00
Jingwen Chen
e14b481913 Allowlist system/core/libstats/expresslog am: c6f3c10615 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762805

Change-Id: I48517210dd37efa1cd1aab709487e4887a7d5334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 05:01:27 +00:00
Treehugger Robot
a4a110f531 Merge "Add bp2build for rust_protobuf module" into main am: 0c0b0d6857 am: 0c35a98fed am: 75f1ef4a1a am: fac4e6b97e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757770

Change-Id: I26a429b03fc3ec307603f2da21f7ae0b989e2687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 03:59:16 +00:00
Treehugger Robot
59210990a1 Merge "Skip snapshot for sanitizer variants with both cfi and hwasan" into main am: b5a1bbffda am: 3242266a8e am: cdd053d96e am: a7ae4a45af 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761547

Change-Id: Ie17debb0a591662d4864c93acce13d28244f2278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 03:57:50 +00:00
Treehugger Robot
fac4e6b97e Merge "Add bp2build for rust_protobuf module" into main am: 0c0b0d6857 am: 0c35a98fed am: 75f1ef4a1a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757770

Change-Id: Ifd0946fa8e9c0b9a96c1915ddd7380c811c07b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 03:17:29 +00:00
Treehugger Robot
a7ae4a45af Merge "Skip snapshot for sanitizer variants with both cfi and hwasan" into main am: b5a1bbffda am: 3242266a8e am: cdd053d96e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761547

Change-Id: Ifc5522d987343999685c211c8951bca9d53f48fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 03:17:10 +00:00
Treehugger Robot
75f1ef4a1a Merge "Add bp2build for rust_protobuf module" into main am: 0c0b0d6857 am: 0c35a98fed 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757770

Change-Id: Icdeb8c60f170879d9fbd0ec8b4adebabbaafac6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 02:24:00 +00:00
Treehugger Robot
cdd053d96e Merge "Skip snapshot for sanitizer variants with both cfi and hwasan" into main am: b5a1bbffda am: 3242266a8e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761547

Change-Id: I1a8bc9d399ba0047de2478ba57e3af956dbd7de3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 02:23:16 +00:00
Jihoon Kang
6c54015e4a Merge changes from topics "remove_api_files", "remove_naming_convention" into main am: 534e2e504d am: 426d016353 am: 1eaf6404ab am: 3f2880d220 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758365

Change-Id: Ic2bb72e87e1e86d583d643a17b78da64230dd30f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 02:10:12 +00:00
Jingwen Chen
c6f3c10615 Allowlist system/core/libstats/expresslog 
Fixes: 302046711
Test: b build //system/core/libstats/expresslog:libexpresslog --config=android
Change-Id: I904fa0e6bd31d454ec38be91dbeecb765593266c
 2023-09-26 02:02:08 +00:00
Jihoon Kang
3f2880d220 Merge changes from topics "remove_api_files", "remove_naming_convention" into main am: 534e2e504d am: 426d016353 am: 1eaf6404ab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758365

Change-Id: I36d5d12b8c7f51bc2570dcb9bbc7de21ed277425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 01:29:49 +00:00
Treehugger Robot
0c35a98fed Merge "Add bp2build for rust_protobuf module" into main am: 0c0b0d6857 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757770

Change-Id: I12690c9bf783bee632065594bc11f1b57a1bdca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 01:26:59 +00:00
Treehugger Robot
3242266a8e Merge "Skip snapshot for sanitizer variants with both cfi and hwasan" into main am: b5a1bbffda 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761547

Change-Id: I37f842e2d16f32a88dd4323090d2ddb207c547b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 01:25:09 +00:00
Treehugger Robot
0c0b0d6857 Merge "Add bp2build for rust_protobuf module" into main 2023-09-26 00:51:06 +00:00
Treehugger Robot
b5a1bbffda Merge "Skip snapshot for sanitizer variants with both cfi and hwasan" into main 2023-09-26 00:41:09 +00:00
Jihoon Kang
1eaf6404ab Merge changes from topics "remove_api_files", "remove_naming_convention" into main am: 534e2e504d am: 426d016353 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758365

Change-Id: I2e80357f673486b0160fa0569e0990d1a726b3d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 00:36:29 +00:00
Jihoon Kang
426d016353 Merge changes from topics "remove_api_files", "remove_naming_convention" into main am: 534e2e504d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758365

Change-Id: I4c4f4eb70b7cabeb7d7cb53bc0d7c5cc8df3912c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 23:37:38 +00:00
Jihoon Kang
534e2e504d Merge changes from topics "remove_api_files", "remove_naming_convention" into main 
* changes:
  Remove naming conventioned based file sorting in java_api_library
  Remove api_files property from java_api_library
 2023-09-25 22:31:53 +00:00
Vinh Tran
47faaad254 Add bp2build for rust_protobuf module 
We only supported bp2build for rust_protobuf_host because the non-host toolchain for rust is not checked in yet. aosp/2759750 changed a converted module from rust_protobuf_host to rust_protobuf and broke CI.

This CL adds bp2build support for rust_protobuf but makes the target incompatible with android os for now untilnon-host rust toolchain is checked in.

Bug: 301956497
Test: b build //build/make/tools/aconfig:all --config=android
Change-Id: I739896c79f32674000c2603e394f16860a6fc57d
 2023-09-25 17:37:59 -04:00
Spandan Das
af72583468 Generate a ndk_sysroot target in bp2build 
This target will have a dependency edge to every bp2build equivalent of
Soong's ndk_headers. In b builds, sdk variants will compile against this
aggregated CcInfo providing target

A non monolithic alternative was discarded after conversations in
b/300504837#comment1-5

Contents of bp2build generated target: https://paste.googleplex.com/6643820291686400

Implementation details
- Since there is no equivalent Soong module for ndk_sysroot, hardcode
  bp2build/build_conversion.go to collect all ndk_headers soong modules.
  Add them to `deps` of a ndk_sysroot target
- Create `ndk_sysroot` in build/bazel/rules/cc/BUILD.bazel. This is
  expected to be a temporary location. This will use the
  cc_library_headers macro
- Update SetStubsForDynamicDeps so that sdk variant of rdeps depends on
  //build/bazel/rules/cc:ndk_sysroot. This will provide a CcInfo during
  compilation. Since ndk_sysroot is of type cc_library_headers, it will
  not get packaged into the apk.
- Refactor `goBazelTarget` to a generic `bTarget` so that it is
  representative of the expanded usage by ndk_sysroot

Test: b build //build/bazel/examples/android_app/java/com/app:app_with_sdk_variant_of_jni_deps --config=android (with aosp/2755284)

Bug: 300504837

Change-Id: Ifa427dd78115703ab251b0e1a0b71d3f19e91008
 2023-09-25 21:27:19 +00:00
Treehugger Robot
7e457d9bc0 Merge "Enable/disable optimize for android_test and android_test_helper_app by default." into main am: b95a8b33be am: f9827be517 am: b70f9d862d am: bb57478524 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757255

Change-Id: Ie9add02f3b3d50c6d4e18eb2d29a4f7f9f34d921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 20:48:13 +00:00
Cole Faust
c5d316c181 Merge "Emit a system image target for the current product" into main am: 71aa535721 am: 7c10bc2e58 am: 8f93602ae4 am: 10fd5a6d7c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758087

Change-Id: Idbfc29fa603c4d561762bc93e1e8aad56a22ddfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 20:46:49 +00:00
Treehugger Robot
bb57478524 Merge "Enable/disable optimize for android_test and android_test_helper_app by default." into main am: b95a8b33be am: f9827be517 am: b70f9d862d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757255

Change-Id: Ia92b88e333d61fbee32b060ae82ed60b629b5809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 20:04:31 +00:00
Cole Faust
10fd5a6d7c Merge "Emit a system image target for the current product" into main am: 71aa535721 am: 7c10bc2e58 am: 8f93602ae4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758087

Change-Id: Iccdba951d02c8b187a3aab1249b4b22cfb6139db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 20:02:54 +00:00
Treehugger Robot
b70f9d862d Merge "Enable/disable optimize for android_test and android_test_helper_app by default." into main am: b95a8b33be am: f9827be517 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757255

Change-Id: I19a05327569f6ef734c4993d7e084baf10694f28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 19:10:13 +00:00
Cole Faust
8f93602ae4 Merge "Emit a system image target for the current product" into main am: 71aa535721 am: 7c10bc2e58 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758087

Change-Id: I11d60da065902531b6a53dce194ec09cd089c569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 19:08:59 +00:00
Usta (Tsering) Shrestha
6142e6585f Merge "Include label in aquery error" into main am: ed0163ec88 am: 3e6167ef80 am: bd54226cd6 am: fe482d98c0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758187

Change-Id: I4a69ced0c127d90fa8f46494962236f0e2c63b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 18:56:25 +00:00
Usta (Tsering) Shrestha
fe482d98c0 Merge "Include label in aquery error" into main am: ed0163ec88 am: 3e6167ef80 am: bd54226cd6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758187

Change-Id: I9c201c1d614cae757f322d2f9898676bbb9b5dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 18:13:43 +00:00
Treehugger Robot
f9827be517 Merge "Enable/disable optimize for android_test and android_test_helper_app by default." into main am: b95a8b33be 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757255

Change-Id: I1fdccdc4f9f8eaf819967e2379dfb174639d5e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 18:11:19 +00:00
Cole Faust
7c10bc2e58 Merge "Emit a system image target for the current product" into main am: 71aa535721 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758087

Change-Id: Ib90eda741288a29c3b0d432a208ec4a09ef8af23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 18:09:20 +00:00
Treehugger Robot
b95a8b33be Merge "Enable/disable optimize for android_test and android_test_helper_app by default." into main 2023-09-25 17:51:14 +00:00
Usta (Tsering) Shrestha
bd54226cd6 Merge "Include label in aquery error" into main am: ed0163ec88 am: 3e6167ef80 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758187

Change-Id: I0e3fb554e2d305534924ede150f179ae789f1272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 17:16:15 +00:00