Commit Graph

7613 Commits

Author SHA1 Message Date
Jingwen Chen
be81da7e7e Merge "Allowlist directories for tradefed's deps." into main am: 6b73be150c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2763425

Change-Id: Ibaea54cfece3200a546989ed869f5a018e2d74ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 08:04:41 +00:00
Jingwen Chen
6b73be150c Merge "Allowlist directories for tradefed's deps." into main 2023-09-28 06:51:29 +00:00
Maxim Siniavine
6b149c846a Merge changes from topic "revert-2755310-HIIDCMFNIU" into main am: 4aa82a13db am: 12663c872e am: dbfe6b66dc am: 8f08662dee am: 7175f020ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766348

Change-Id: I0c1cc1883d430230175d3e89c94a88b9a52b9ce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 06:04:46 +00:00
Maxim Siniavine
943dc1b6f4 Revert "Add flagged api hide conditional to droidstubs" am: 1180919dda am: 57639c5e65 am: 4a564b5bcd am: b1b05aea50 am: c18a909a93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766347

Change-Id: I81e893d4fce8c1bde51f2ae66e299f79d4868a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 06:04:43 +00:00
Romain Jobredeaux
49c184262f Merge changes from topic "bazel_framework_res" into main am: 641b62b205 am: b0e61183f3 am: f1a3d7a303 am: ae9096771c am: bb53a4fc75
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2720593

Change-Id: I9a9b31f51bced57a22db829cdf0dee58fd11f200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 01:58:21 +00:00
Maxim Siniavine
12663c872e Merge changes from topic "revert-2755310-HIIDCMFNIU" into main am: 4aa82a13db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766348

Change-Id: I51b0213f78192a3a6d8fc92a3e995e2fb16a606f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 01:55:28 +00:00
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
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
Treehugger Robot
0779335110 Merge "Add frameworks/base/mime to allowlist" into main am: 1eeda315c8 am: 96c36f1606 am: ce8c608076 am: dd24a1de58 am: dd26735190
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747518

Change-Id: I023e74d6ab57519d54bd561bcb5d15c82db277e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 22:54:30 +00:00
Jihoon Kang
15ec654d53 Merge changes from topic "expose_flagged_api" into main am: af26c102b8 am: ff593197d9 am: daa3a1a2db am: 9ddde37234 am: c38c9e3f1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755310

Change-Id: I69422f68540212dbd178e469e2bf4bbb1931fb7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 22:51:56 +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
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
b68ae52b8a Merge changes from topic "reland-rust-sbox-1" into main am: ec59517f6a am: fcf6a3c1d4 am: 0d1b6ee209 am: 96ada66b39 am: 6eb6184c2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761808

Change-Id: Ifec3910de8a11bb8d3e0bbc1706b0a9017fa092d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 13:22:42 +00:00
Sam Delmerico
1574f29b3b Revert^4 "allow Ninja variables in RuleBuilder API" am: 285b66a117 am: 6fea084d2b am: e9d00acc22 am: 3828daa900 am: 599967b047
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761807

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

Change-Id: Ife6dd32877ecf0ea1efea9183f4fa0628623ef51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 13:22:30 +00: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
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
6cb630051d Merge "Allowlist libflagtest and FlagMacrosTests." into main am: c5b9abba30 am: 6d66f26e74 am: 4e4b4c7888 am: c4d0789937 am: d99ece8527
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759040

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

Change-Id: I276bdb3abdd3baaa9cfc230d8ca961559b71eceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 03:05:23 +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
Jihoon Kang
948d775d19 Merge "Import make variable NextReleaseHideFlaggedApi to Soong" into main am: e4bb4d4e6b am: 9e613388e3 am: 94f35434bf am: a8e6f67098 am: ca7422b0b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755309

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

Change-Id: Ie56a0238170c57388e2600632874c093fbed131d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 22:30:18 +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
3ec34d74a7 Allowlist system/core/libstats/expresslog am: c6f3c10615 am: e14b481913 am: 09d8de8b0d am: 023959e3c6 am: a21f382fd9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762805

Change-Id: I38431cebb184aae4f8bfe3a51d7cb55e1c168fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 08:40:43 +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
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