StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,737 Commits 1 Branch 0 Tags
f1037ec0eb82fe524760568f94e24d86cf38a7c6
Commit Graph

73737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Jobredeaux
f1037ec0eb Merge "Do not convert android_library_import with no aars." into main am: 832e131725 am: 51cab22f4e am: 2682639f03 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760791

Change-Id: I465ad5a9c6ae52895b4194224a7c3f041ae4b947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 22:35:50 +00:00
Romain Jobredeaux
2682639f03 Merge "Do not convert android_library_import with no aars." into main am: 832e131725 am: 51cab22f4e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760791

Change-Id: Ic0c114edd4d65f57a7c6038d865db81e67ce352e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 21:39:31 +00:00
Colin Cross
9932c623cb Merge "Shard srcjars when sharding javac compilation" into main am: b983ceac33 am: 9a21f40742 am: e693d617c2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762551

Change-Id: I299a5aa429184b63d624172a1ab6d0bb393a53a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 20:41:42 +00:00
Jihoon Kang
a8e6f67098 Merge "Import make variable NextReleaseHideFlaggedApi to Soong" into main am: e4bb4d4e6b am: 9e613388e3 am: 94f35434bf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755309

Change-Id: If2f2b41e1f1d46e9aa3cd89c7e85fbea9a627029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 20:40:59 +00:00
Treehugger Robot
e2fefbd005 Merge "Add system/tools/hidl to allowlist" into main am: 7c02986d60 am: 9a53950763 am: afb6b4c392 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744701

Change-Id: Ie7084489b06f8d59a55f6939e4fd4b60041a9029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 20:40:49 +00:00
Romain Jobredeaux
51cab22f4e Merge "Do not convert android_library_import with no aars." into main am: 832e131725 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760791

Change-Id: I5367d462c705dc1fefde8a0dd39230e5ca9c98c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 20:40:21 +00:00
Romain Jobredeaux
832e131725 Merge "Do not convert android_library_import with no aars." into main 2023-09-26 20:08:04 +00:00
Colin Cross
e693d617c2 Merge "Shard srcjars when sharding javac compilation" into main am: b983ceac33 am: 9a21f40742 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762551

Change-Id: Iab092236065583a885abddac58505e0ff79a66ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 19:20:40 +00:00
Jihoon Kang
94f35434bf Merge "Import make variable NextReleaseHideFlaggedApi to Soong" into main am: e4bb4d4e6b am: 9e613388e3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755309

Change-Id: Id1c1181c38edd50597826483909e7cf6fb2d7c20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 19:19:18 +00:00
Treehugger Robot
afb6b4c392 Merge "Add system/tools/hidl to allowlist" into main am: 7c02986d60 am: 9a53950763 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744701

Change-Id: Ib0b231c59ad535c7d03993ba3525e5efc7775ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 19:19:09 +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
Colin Cross
9a21f40742 Merge "Shard srcjars when sharding javac compilation" into main am: b983ceac33 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762551

Change-Id: I0844a841887d964530f33a99e8fa1469c13d71d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 18:21:49 +00:00
Jihoon Kang
9e613388e3 Merge "Import make variable NextReleaseHideFlaggedApi to Soong" into main am: e4bb4d4e6b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755309

Change-Id: I9416a1016d8fe652db6c40ef5470ee46621e054b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 18:20:33 +00:00
Treehugger Robot
9a53950763 Merge "Add system/tools/hidl to allowlist" into main am: 7c02986d60 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744701

Change-Id: I27eb891fe323c5699ff2fa64ac9baa8ecab8e77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 18:20:19 +00:00
Colin Cross
b983ceac33 Merge "Shard srcjars when sharding javac compilation" into main 2023-09-26 18:01:49 +00:00
Jihoon Kang
e4bb4d4e6b Merge "Import make variable NextReleaseHideFlaggedApi to Soong" into main 2023-09-26 17:49:25 +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
Treehugger Robot
7c02986d60 Merge "Add system/tools/hidl to allowlist" into main 2023-09-26 16:59:03 +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
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
Colin Cross
a052ddbb7e Shard srcjars when sharding javac compilation 
java_library rules with javac_shard_size set split the sources into
shards to invoke javac multiple times, but were using a single javac
invocation for all srcjars.  For fraemwork-minus-apex, this srcjar
shard was the long pole at 15.7 seconds, containing 266 srcjars with
1542 java files with a total of 614593 lines.

Use a rough approximation of 5 sources per srcjar to determine the
number of shards to split the srcjars into based on javac_shard_size.
This results in splitting the srcjars for frameworks-minus-apex into
8 shards, with the longest taking 10.5 seconds to compile.

The longest shard contains most of the aidl srcjars, which have been
generated by sharded groups of 50 aidl files and have a much higher
average number of sources per srcjar (a mean and median of 27).  A
future improvement could be to shard those separately assuming a
higher number of sources per srcjar.

Bug: 302033097
Test: USE_RBE=false m frameworks-minus-apex
Change-Id: I85e740c7fcf5651cf18c0cdc90ab8c6ee39cb47b
 2023-09-25 21:46:58 -07: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
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
Jihoon Kang
cfbc4077b3 Import make variable NextReleaseHideFlaggedApi to Soong 
This change imports NextReleaseHideFlaggedApi exported from soong_config

Test: m nothing
Bug: 299570421
Change-Id: I410596a39d2ba9ad353c5cf48bd38b1e843633b2
 2023-09-25 20:54:46 +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