Maxim Siniavine
57639c5e65
Revert "Add flagged api hide conditional to droidstubs" am: 1180919dda
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766347
Change-Id: Iecdfb508043d33ed23479d4fe758980943b629d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 01:55:22 +00:00
Treehugger Robot
b942e672f9
Merge "Make platform_mappings file deterministic" into main am: f51ed265e4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766205
Change-Id: I314177684139793026d3bbbc375f6d9427dad054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 01:54:52 +00:00
Maxim Siniavine
4aa82a13db
Merge changes from topic "revert-2755310-HIIDCMFNIU" into main
...
* changes:
Revert "Add soong config variable Release_expose_flagged_api"
Revert "Add flagged api hide conditional to droidstubs"
2023-09-28 01:08:44 +00:00
Maxim Siniavine
1180919dda
Revert "Add flagged api hide conditional to droidstubs"
...
Revert submission 2755310
Reason for revert: Broken build b/302407753
Reverted changes: /q/submissionid:2755310
Change-Id: I56306fc3b7e5608d21dbefe18d6a886561599f40
2023-09-28 01:01:59 +00:00
Maxim Siniavine
5548bf3053
Revert "Add soong config variable Release_expose_flagged_api"
...
Revert submission 2755310
Reason for revert: Broken build b/302407753
Reverted changes: /q/submissionid:2755310
Change-Id: Ib5c01033882500296989a7c4476a723d95292aab
2023-09-28 01:01:59 +00:00
Ivan Lozano
d106efe76d
rust: Import protos from dependent rust_protobuf
...
rust_protobuf were unable to import protos from other rust_protobuf
modules. This CL adds support for that. rust_protobuf modules which are
listed in rustlibs will have their modules imported into the generated
protobuf stub. Additionally, rust_protobuf modules which define
"exported_include_dirs" will export those include paths to dependent
rust_protobuf modules.
Bug: 301266700
Test: m rust
Change-Id: I132edffa4d77e0ac80a7ac934f873374c8e94c1b
2023-09-27 20:53:54 -04:00
Treehugger Robot
f51ed265e4
Merge "Make platform_mappings file deterministic" into main
2023-09-28 00:37:51 +00:00
Chris Parsons
8a532b78e5
Update bp2build tests to use stubbed defs
...
bp2build tests should not use bp2build_available:false test deps,
because, with the "allowlist v2" feature, this will cause these modules
to stop being converted with bp2build. Instead, such test deps should be
"stubbed", which effectively treats them like targets in pre-existing
BUILD files on the filesystem.
Bug: 301312260
Test: m nothing
Change-Id: Ib1ce7c87cd1e98568fdaf2a52a893dafa74ab327
2023-09-27 23:11:26 +00:00
Romain Jobredeaux
b0e61183f3
Merge changes from topic "bazel_framework_res" into main am: 641b62b205
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2720593
Change-Id: Ifb2c83f9d7390a2f40083ab4e3f8625bbe5f45af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 21:47:27 +00:00
Chris Parsons
2173b5f578
support aidl bp2build changes
...
- Allowlist an aidl module by package, not name (to support a small
module name change)
- Implement some unit test framework changes which facilitate better
aidl bp2build testing
- Support a convenience function to add a load hook for registering a
module as "has a bazel definition of a given target name"
Bug: 301676937
Test: m bp2build, verified the aidl target was generated before/after
this CL.
Test: Presubmits
Test: Ran bp2build progress and ensured that aidl_interface targets
under frameworks/ continued to appear converted
Change-Id: I62412057d6f61a2ce2bc39488c75af793eb14c94
2023-09-27 21:30:19 +00:00
Cole Faust
b5055394a9
AVB and selinux support in partitions
...
Bug: 297269187
Test: m bazel_sandwich (updated partition_inspector to show selinux contexts, but still haven't figured out how to show avb information)
Change-Id: I6911c2fc75495f9722887925d8609c9a171901c6
2023-09-27 14:14:14 -07:00
Cole Faust
e136ddac77
Make platform_mappings file deterministic
...
Fixes: 301473943
Test: presubmits
Change-Id: I24a1fef87c1fb59b5aeb8ac9c05306cddee32399
2023-09-27 14:14:01 -07:00
Romain Jobredeaux
641b62b205
Merge changes from topic "bazel_framework_res" into main
...
* changes:
bp2build support for framework-res
Keep rules_testing BUILD files
2023-09-27 20:52:50 +00:00
Sam Delmerico
7a346cdaa0
Revert^2 "rustSetToolchainSource to use linux-x86 srcs"
...
7ba7e8232b
Change-Id: Ia10aede6a8b7422848146500506458ae495f7b9a
2023-09-27 20:45:48 +00:00
Treehugger Robot
ab601f2df9
Merge "Fix false positives of go modules in bpbuild-prog" into main am: aaf91a48e9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2765225
Change-Id: I486b8f9981c0f9f2f0c0d21a3088f9d567f9a9b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:45:30 +00:00
Treehugger Robot
96c36f1606
Merge "Add frameworks/base/mime to allowlist" into main am: 1eeda315c8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747518
Change-Id: Ibe47a852792b0b60c5f31b41cbbdbdf918c017e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:44:42 +00:00
Zi Wang
1066479258
Always drop deps from android_library with no srcs
...
android_library does not accept deps when there are no srcs because
there is no compilation happening. The libs of android_library module
are unnecessary as deps on the android_library since they aren't
being propagated to any dependencies.
So we can drop deps here.
Test: the updated test case and CI
Bug: 302290600
Change-Id: Ib43a1c273a5f3b3e0aa6f29f4e8569ad3487e451
2023-09-27 12:36:36 -07:00
Treehugger Robot
aaf91a48e9
Merge "Fix false positives of go modules in bpbuild-prog" into main
2023-09-27 19:33:56 +00:00
Treehugger Robot
1eeda315c8
Merge "Add frameworks/base/mime to allowlist" into main
2023-09-27 18:52:42 +00:00
Jihoon Kang
ff593197d9
Merge changes from topic "expose_flagged_api" into main am: af26c102b8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755310
Change-Id: Ib2f36facf87375c0502f5645b413e1d2b1b60815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:52:34 +00:00
Aleksei Vetrov
58f600b8af
Merge "NDK library: fix ABI monitoring error message" into main am: 31bbfe911b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757565
Change-Id: Ie3b48d2fe6afa087d9ffcc5c4c72b4dd1f69cf52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:52:17 +00:00
Jihoon Kang
af26c102b8
Merge changes from topic "expose_flagged_api" into main
...
* changes:
Add flagged api hide conditional to droidstubs
Add soong config variable Release_expose_flagged_api
2023-09-27 17:09:27 +00:00
Aleksei Vetrov
31bbfe911b
Merge "NDK library: fix ABI monitoring error message" into main
2023-09-27 16:38:57 +00:00
Vinh Tran
0bc8c956fe
Change bp2build to switch to using custom fdo_profile macro
...
Test: go test
Bug: 260714900
Change-Id: Iead64ac7b30a3e706d8fb10899ecd8a1852bc32c
2023-09-27 11:10:58 -04:00
Liz Kammer
15d7b0b0a5
Fix false positives of go modules in bpbuild-prog
...
Test: b run //build/bazel/scripts/bp2build_progress:bp2build_progress \
-- report -m tradefed
Change-Id: I5b9ed1333d61013649056920ffe7110e9786b29e
2023-09-27 09:38:41 -04:00
Jingwen Chen
7501a1b15b
Allowlist directories for tradefed's deps.
...
Fix: 302094734
Test: presubmits/bp2build-incremental
Test: b build //tools/tradefederation/core/util_apps/... --config=android
Change-Id: I3d35650a1001defb74eb93a62b361109a5baccd9
2023-09-27 13:10:45 +00:00
Sam Delmerico
fcf6a3c1d4
Merge changes from topic "reland-rust-sbox-1" into main am: ec59517f6a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761808
Change-Id: I8f4ad3d412915b05763324b3e2e96c3af1ce8678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 09:13:36 +00:00
Sam Delmerico
6fea084d2b
Revert^4 "allow Ninja variables in RuleBuilder API" am: 285b66a117
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761807
Change-Id: Ia3ddf40e8f6611eb8c78051e4dae435df5ad8263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 09:13:31 +00:00
Sam Delmerico
cff79b5237
Revert^4 "add crate_root property to rust modules" am: 63ca14e9b7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761806
Change-Id: Iad6f5bc07febfa4baa3550f94da5333dc657475b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 09:13:28 +00:00
Sam Delmerico
942a640911
Revert^4 "add rust_toolchain_rustc_prebuilt module type" am: f2b16069bb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761805
Change-Id: I4cbbd46025c81e327daff9f4691133aa3b80dc06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 09:13:22 +00:00
Sam Delmerico
ec59517f6a
Merge changes from topic "reland-rust-sbox-1" into main
...
* changes:
Revert^2 "conditionally escape rule builder command"
Revert^4 "allow Ninja variables in RuleBuilder API"
Revert^4 "add crate_root property to rust modules"
Revert^4 "add rust_toolchain_rustc_prebuilt module type"
2023-09-27 08:10:26 +00:00
Justin Yun
af1fde43f9
Generate product variants by default
...
PRODUCT_PRODUCT_VNDK_VERSION is set to 'current' by default. Now, we
can generate product variants without checking the
PRODUCT_PRODUCT_VNDK_VERSION build variable. Remove reading the
PRODUCT_PRODUCT_VNDK_VERSION variable from soong and generate product
variants by default.
Bug: 302255959
Test: m
Change-Id: I9a9b2076f4367c5ce9a393bbb206f8dee3884bd8
2023-09-27 16:36:40 +09:00
Treehugger Robot
6d66f26e74
Merge "Allowlist libflagtest and FlagMacrosTests." into main am: c5b9abba30
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759040
Change-Id: I47b70a92547b52eecc7ab5db03646a33529a2a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 00:20:27 +00:00
Treehugger Robot
038fc40bb4
Merge "Fix for ndk having sanitizers" into main am: 37f9391768
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2763706
Change-Id: I5b039b131a34fd76218eb479938bab09b41333ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 00:19:46 +00:00
Treehugger Robot
c5b9abba30
Merge "Allowlist libflagtest and FlagMacrosTests." into main
2023-09-27 00:18:46 +00:00
Treehugger Robot
37f9391768
Merge "Fix for ndk having sanitizers" into main
2023-09-26 23:46:49 +00:00
Zi Wang
79c8edd421
Merge "Allowlist part of tradefed deps" into main am: ffb9a2af93
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759797
Change-Id: I1f260b14d060d7b7ec7e219baed4ad4559b60c2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 23:23:07 +00:00
Jihoon Kang
d91a8e806a
Add flagged api hide conditional to droidstubs
...
APIs annotated with @FlaggedApi should not be included in the artifact
when building sdk target products in the "next" release configuration.
This change adds such logic by passing additional flag to metalava in
droidstubs.
The flag does not need to be passed to metalava invocation done in
java_api_library, as java_api_library generates stubs using api
signature files (i.e. *-current.txt files), and they will not contain
apis marked @FlaggedApi. The metalava invocation in droidstubs is
responsible for removing such apis.
Test: go test ./java && m TARGET_PRODUCT=sdk TESTING_TARGET_RELEASE_NEXT=true nothing and inspect ninja command for generating stubs and verify the flag is included
Bug: 299570421
Change-Id: Ia4b699b6e3ff6324f050eecc9ff5b622fdc04621
2023-09-26 22:46:05 +00:00
Jihoon Kang
03f1aa064a
Add soong config variable Release_expose_flagged_api
...
The variable is a release config variable which will be used to
determine whether if the api marked @FlaggedApi is exposed or not.
Test: m nothing
Bug: 299570421
Change-Id: I5647608065543cf5059836f6d6e8906a23145541
2023-09-26 22:32:50 +00:00
Liz Kammer
06d442e954
Add frameworks/base/mime to allowlist
...
Test: b build //frameworks/base/mime/...
Test: b build //frameworks/base/mime/... --config=android
Change-Id: If73e04e33487bbb63e14475b34f34b31b1386f16
2023-09-26 22:22:58 +00:00
Zi Wang
ffb9a2af93
Merge "Allowlist part of tradefed deps" into main
2023-09-26 22:20:02 +00:00
Liz Kammer
ba23cb6436
Fix for ndk having sanitizers
...
Test: go test soong tests
Test: verify no NeuralNetworksTest_random_graph sdk variants in
build.ninja when aosp_x86 is lunched
Bug: 302093869
Change-Id: I6429aa75518cca6974abcf7330236a6a07135ea1
2023-09-26 17:06:33 -04: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
Romain Jobredeaux
9c06ef353b
bp2build support for framework-res
...
Change-Id: I5b32a702e02b5f1ec08d5608d766a8a0c08d845c
Bug: 276928228
Bug: 297356405
2023-09-26 15:06:50 -04:00
Romain Jobredeaux
c9e585eabf
Keep rules_testing BUILD files
...
Change-Id: I9036ac0c372f1935e29477bdd1a42203f65e5385
2023-09-26 15:04:13 -04: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