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
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
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
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
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
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
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
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
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
c5b9abba30
Merge "Allowlist libflagtest and FlagMacrosTests." into main
2023-09-27 00:18:46 +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
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
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
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
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
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
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
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
Cole Faust
71aa535721
Merge "Emit a system image target for the current product" into main
2023-09-25 17:08:34 +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
Sam Delmerico
285b66a117
Revert^4 "allow Ninja variables in RuleBuilder API"
...
789a7e0883
2023-09-25 12:13:17 +00:00
Sam Delmerico
f2b16069bb
Revert^4 "add rust_toolchain_rustc_prebuilt module type"
...
930fd8bfb1
2023-09-25 12:13:17 +00:00
Sam Delmerico
d46f6c81de
Revert^2 "conditionally escape rule builder command"
...
53ed08aec0
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
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
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
Zi Wang
ada4983493
Merge "Pass java_library libs and static_libs to java_*_proto_library" into main am: 7c5b6d5273
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759538
Change-Id: Ibd96e46776b1a3a038c5fab4bcb7d0d8895a0441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 04:58:36 +00:00
Zi Wang
7c5b6d5273
Merge "Pass java_library libs and static_libs to java_*_proto_library" into main
2023-09-23 03:45:48 +00:00
Treehugger Robot
febe41d738
Merge "Switch bp2build mutator to bottom up" into main am: 11b20b2993
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760865
Change-Id: Id965f8ee11d2e7c64cc7e085bc902a00ec0daed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 01:20:30 +00:00
Treehugger Robot
11b20b2993
Merge "Switch bp2build mutator to bottom up" into main
2023-09-23 00:05:47 +00:00
Wonsik Kim
9ca0761342
Merge "Add libcodec2_aidl into allowlist" into main am: ee03e4e577
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734654
Change-Id: I08aaa6e8afbdb830cacc43fc6ca295d4193cc00d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 22:39:24 +00:00
Wonsik Kim
ee03e4e577
Merge "Add libcodec2_aidl into allowlist" into main
2023-09-22 22:12:33 +00:00
Wen-yi Chu
789a7e0883
Revert^3 "allow Ninja variables in RuleBuilder API"
...
0e2d63e4d2
2023-09-22 22:05:54 +00:00
Wen-yi Chu
53ed08aec0
Revert "conditionally escape rule builder command"
...
Revert submission 2629131-sandbox-rust-inputs
Reason for revert: Fail on android build.
Reverted changes: /q/submissionid:2629131-sandbox-rust-inputs
Change-Id: I0d70fb9bbb9597d5fa68e764cdcf57f1a0333037
2023-09-22 22:05:54 +00:00
Wen-yi Chu
41326c1f41
Revert "support sandboxed rust rules"
...
Revert submission 2629131-sandbox-rust-inputs
Reason for revert: Fail on android build.
Reverted changes: /q/submissionid:2629131-sandbox-rust-inputs
Change-Id: Ifd9aa46e80a12d8f4ffa0a2daa74b96727cbb7e6
2023-09-22 22:05:54 +00:00
Wen-yi Chu
930fd8bfb1
Revert^3 "add rust_toolchain_rustc_prebuilt module type"
...
9333ac1249
2023-09-22 22:05:54 +00:00
