StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,022 Commits 1 Branch 0 Tags
8e15f69709f70fce745bcd281a1a2bc04468f95d
Commit Graph

72022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7c02986d60 Merge "Add system/tools/hidl to allowlist" into main 2023-09-26 16:59:03 +00:00
Zi Wang
aa516c562e Allowlist part of tradefed deps 
Test: CI

Bug: 283193845
Change-Id: Idab167cc1698f40a3853967f31533bdfb6fbd455
 2023-09-26 09:39:57 -07: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
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
Matthias Maennich
0a6c5c2ffb NDK library: enable feature flags for diffing ABI representations 
Bug: 156513478
Change-Id: I94a0e2de051da9d9d82414a7189399553981c53f
Signed-off-by: Matthias Maennich <maennich@google.com>
 2023-09-26 11:30:47 +00:00
Aleksei Vetrov
9c8c5ab3c3 NDK library: fix ABI monitoring error message 
Error message in case of not valid "nextAbiDump" included wrong
"prebuiltAbiDump.InvalidReason()". Refactor error message to include
"nextAbiDump.InvalidReason()" instead.

Change-Id: I2581734dd16649af2b282b3459f461658abd3d87
Signed-off-by: Aleksei Vetrov <vvvvvv@google.com>
 2023-09-26 11:30:47 +00:00
Matthias Maennich
774bac189a NDK library: enable feature flags for dumping ABI representations 
Bug: 156513478
Change-Id: I95ebfef65bcadb34f7ed03e34f29e3d6ca363a9f
Signed-off-by: Matthias Maennich <maennich@google.com>
 2023-09-26 11:30:47 +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
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
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
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
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
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
Cole Faust
71aa535721 Merge "Emit a system image target for the current product" into main 2023-09-25 17:08:34 +00:00
Usta (Tsering) Shrestha
3e6167ef80 Merge "Include label in aquery error" into main am: ed0163ec88 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758187

Change-Id: I32e456ae7860a5bce3bac9833859f49de23118fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 16:20:34 +00:00
Alyssa Ketpreechasawat
34feb68b28 Disable hiddenapi check for building from prebuilts. 
Add ReleaseDefaultModuleBuildFromSource to config.productVariables and
use this parameter to disable hiddenapi check.

Test: DEFAULT_MODULE_BUILD_FROM_SOURCE=false m (not failing hiddenapi
check after disabling)
Bug: 301871981
Change-Id: I86b3f3bc21d546022a503a1c6a8a641d4e785565
 2023-09-25 15:45:42 +00:00
Jingwen Chen
65229207d1 Enable/disable optimize for android_test and android_test_helper_app by default. 
Follow up to https://android-review.git.corp.google.com/c/platform/build/bazel/+/2727853/comment/f2c5802e_245fd302/

Test: New unit tests, presubmits
Test: `atest-dev HelloWorldTests --roboleaf-mode=dev`

Change-Id: I88efcf72fbcb717d05e71ba50ba7802c3bece816
 2023-09-25 15:27:33 +00:00
Usta (Tsering) Shrestha
ed0163ec88 Merge "Include label in aquery error" into main 2023-09-25 15:09:31 +00:00
Jingwen Chen
b70c096a65 Allowlist libflagtest and FlagMacrosTests. 
Test: atest-dev FlagMacrosTest --roboleaf-mode=dev
Fixes: 300335177
Change-Id: I44a63b0a1aa6bef30736f72d01d7a80930e2f48d
 2023-09-25 14:58:54 +00:00
Justin Yun
a05a4f6f87 Skip snapshot for sanitizer variants with both cfi and hwasan 
cfi and hwasan cannot be enabled at the same time. Skip building
vendor snasphots for the snapshot variants with both cfi and hwasan.

Bug: 277174974
Bug: 290779821
Test: HWASAN_INCLUDE_PATHS=frameworks/native/libs/gui m
Change-Id: Iaae913367a70e150d77a614de5f942aea98d1086
 2023-09-25 23:07:49 +09:00
Sam Delmerico
285b66a117 Revert^4 "allow Ninja variables in RuleBuilder API" 
789a7e0883

Change-Id: Iee1156adf0ad6e6d2ae7e22d90a447d4b564e59f
 2023-09-25 12:13:17 +00:00
Sam Delmerico
63ca14e9b7 Revert^4 "add crate_root property to rust modules" 
9c64274b27

Change-Id: I1c4dad76842cebf18cd82e04e435910f09038d07
 2023-09-25 12:13:17 +00:00
Sam Delmerico
f2b16069bb Revert^4 "add rust_toolchain_rustc_prebuilt module type" 
930fd8bfb1

Change-Id: Id3f3a66022a496aab7db93670a7bdf8507384875
 2023-09-25 12:13:17 +00:00
Sam Delmerico
d46f6c81de Revert^2 "conditionally escape rule builder command" 
53ed08aec0

Change-Id: Ic6e754bb270dbd3fa67ec31b5cbc1c5ef77d3238
 2023-09-25 12:13:17 +00:00
Colin Cross
b0fe75a004 Merge changes from topics "revert-2629131-sandbox-rust-inputs-JRFPQTIPEY", "revert-2758566-WBNIADIEXA" into main am: 40c7bae1df 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760293

Change-Id: I05800e293df18c7a6079abbb02af8ce94b0b716a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 05:54:58 +00:00
Wen-yi Chu
fb469c9fec Revert^3 "add crate_root property to rust modules" am: 9c64274b27 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760292

Change-Id: I39bed7f02d96091cfb717915db23f1da4dacec66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 05:54:55 +00:00
Wen-yi Chu
60b2da8b43 Revert^3 "allow Ninja variables in RuleBuilder API" am: 789a7e0883 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760291

Change-Id: I48dbb3b94265634344f2037a5b2c9f69f80db9bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 05:54:52 +00:00
Wen-yi Chu
5de40ab122 Revert "conditionally escape rule builder command" am: 53ed08aec0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760290

Change-Id: I6601196a66e8cd1a0a6993c42d851913a73e127d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 05:54:49 +00:00
Wen-yi Chu
5a2dfb3d25 Revert "support sandboxed rust rules" am: 41326c1f41 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760289

Change-Id: Ifa1ec899f66954979baee61755822788a30fbffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 05:54:45 +00:00
Colin Cross
879e9e386d Revert "fix failing rust_aconfig_library test" am: df0ed707a5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760067

Change-Id: I5c09ddc7ed3787f4d0e22f4c83a5514de3d0afe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 05:54:42 +00:00
Colin Cross
d1cf4d003e Revert "rustSetToolchainSource to use linux-x86 srcs" am: 7ba7e8232b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760228

Change-Id: I583926f7000c5f4e7fbd972f815aa7741d56beb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 05:54:35 +00:00
Colin Cross
a180d79ed0 Revert "remove rust deps on clang prebuilts" am: 05cbcb3539 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760227

Change-Id: I942dfaa79421482d14b48cb464e437dc826bc505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 05:54:26 +00:00
Colin Cross
40c7bae1df Merge changes from topics "revert-2629131-sandbox-rust-inputs-JRFPQTIPEY", "revert-2758566-WBNIADIEXA" into main 
* changes:
  Revert^3 "add rust_toolchain_rustc_prebuilt module type"
  Revert^3 "add crate_root property to rust modules"
  Revert^3 "allow Ninja variables in RuleBuilder API"
  Revert "conditionally escape rule builder command"
  Revert "support sandboxed rust rules"
  Revert "fix failing rust_aconfig_library test"
  Revert "rustSetToolchainSource to use linux-x86 srcs"
  Revert "remove rust deps on clang prebuilts"
 2023-09-23 05:19:13 +00:00
Ray Chin
458618af33 Merge "Fix read file error in extract_apks" into main am: 4ad574cc37 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759426

Change-Id: I673a54ced930ec1ce0df7301bec8a9fad1482954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 04:58:52 +00:00