Commit Graph

72452 Commits

Author SHA1 Message Date
Romain Jobredeaux
f1a3d7a303 Merge changes from topic "bazel_framework_res" into main am: 641b62b205 am: b0e61183f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2720593

Change-Id: I982a8d244d21dba4d09d2e568f03fecf1ac1d508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 22:53:48 +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
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
Treehugger Robot
f81c892811 Merge "Fix false positives of go modules in bpbuild-prog" into main am: aaf91a48e9 am: ab601f2df9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2765225

Change-Id: Ic8aac160c907d43a766b5554b7aa520b34bc0a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:50:40 +00:00
Treehugger Robot
ce8c608076 Merge "Add frameworks/base/mime to allowlist" into main am: 1eeda315c8 am: 96c36f1606
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747518

Change-Id: Ic8ea7855dbfe1a8725aaa661b6bb4e0d8538ea30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:48:46 +00:00
Jihoon Kang
daa3a1a2db Merge changes from topic "expose_flagged_api" into main am: af26c102b8 am: ff593197d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755310

Change-Id: I151c659f99d71568c7e75ea4f679aa9d60abad56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:47:53 +00:00
Aleksei Vetrov
28c6d4d97c Merge "NDK library: fix ABI monitoring error message" into main am: 31bbfe911b am: 58f600b8af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757565

Change-Id: I48e063fea5dbab485c09704ebfbc562fe69e043d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:47:44 +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
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
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
Sam Delmerico
0d1b6ee209 Merge changes from topic "reland-rust-sbox-1" into main am: ec59517f6a am: fcf6a3c1d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761808

Change-Id: I7ffa6615a9fa4a272fd3571c6a95ce9efe7d9661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 10:19:44 +00:00
Sam Delmerico
e9d00acc22 Revert^4 "allow Ninja variables in RuleBuilder API" am: 285b66a117 am: 6fea084d2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761807

Change-Id: I398fa595071ae9128f8edb975ed7b865df5fa9d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 10:19:41 +00:00
Sam Delmerico
1cc92cae61 Revert^4 "add crate_root property to rust modules" am: 63ca14e9b7 am: cff79b5237
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761806

Change-Id: Ic236ca00b5ef0f769ce2dcccc6e5075a90d5f38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 10:19:37 +00:00
Sam Delmerico
b875e715af Revert^4 "add rust_toolchain_rustc_prebuilt module type" am: f2b16069bb am: 942a640911
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761805

Change-Id: I4c041428851000927a9173fbb4533ca43de443c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 10:19:32 +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
Treehugger Robot
4e4b4c7888 Merge "Allowlist libflagtest and FlagMacrosTests." into main am: c5b9abba30 am: 6d66f26e74
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759040

Change-Id: Icaef882e0790499b05c9c2ad4389af758a704c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 00:24:50 +00:00
Treehugger Robot
af9310819a Merge "Fix for ndk having sanitizers" into main am: 37f9391768 am: 038fc40bb4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2763706

Change-Id: I8efc5b121900e8a50d398e84fb49b724fff2c8eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 00:24:42 +00:00
Zi Wang
1539f234b1 Merge "Allowlist part of tradefed deps" into main am: ffb9a2af93 am: 79c8edd421
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759797

Change-Id: I2d3f9d08d4f8aa4b73ddee9e142983ea0d744518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 00:24:18 +00: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
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
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
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
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