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

6775 Commits

Author SHA1 Message Date
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
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
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

Change-Id: Iee1156adf0ad6e6d2ae7e22d90a447d4b564e59f
 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
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

Change-Id: I4a22fb398fc7bfdf86613829dfbc9c35fab11ee7
 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

Change-Id: Ic7f064806553a0cfbc286136a764b5ea3898d06c
 2023-09-22 22:05:54 +00:00
Cole Faust
cb193ec471 Emit a system image target for the current product 
This system image can be built with bazel instead of make.

Bug: 297269187
Test: m bazel_sandwich
Change-Id: I5fd61a28f664d8310435c3b7e5dbdd89a7ec6159
 2023-09-22 14:42:33 -07:00
Christopher Parsons
07eb212463 Merge "Handle already existing targets of different name" into main am: 68a3d9b33e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759611

Change-Id: I0e37761d86b7eea343b6dc96ed5124358e4e70ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 19:55:56 +00:00
Chris Parsons
6666d0f6b1 Switch bp2build mutator to bottom up 
This should be no-op, as the underlying mutator has not changed yet.

Some other refactoring is required and done in this CL:

- Delete some old, dead ApiBp2build code
- Fix casting to TopDownMutator when it's not necessary

This change is required to prepare for allowlist v2 work, as only
BottomUp mutators can AddDependency.

Bug: 285631638
Test: m nothing
Test: presubmits
Change-Id: I5212a5f5634cc13056195783e6df37ff8eb000da
 2023-09-22 19:19:22 +00:00
Christopher Parsons
68a3d9b33e Merge "Handle already existing targets of different name" into main 2023-09-22 18:52:07 +00:00
Zi Wang
4dbd0e8688 Pass java_library libs and static_libs to java_*_proto_library 
If a java_library module has proto srcs, a java_*_proto_library target
will be created for it. Proto sources are generated and then compiled
by a java_library target. We need to pass the libs and static_libs of
the java_library module to this java_library target so that
the compile-time classpath is correct.

Test: updated unit tests and CI

Bug: 301469542
Change-Id: I05b2efce6fda2223e85728b3c4c7b1815d04c3dd
 2023-09-22 11:20:06 -07:00
Mark White
a1c9bb08b5 Added new framework-pdf jar inside MediaProvider module 
Bug: 301574837
Test: presubmit and m framework-pdf
Change-Id: Ib5294ef9d1c632777af0ca9225d459cbc188e589
 2023-09-22 13:28:51 +00:00
Motomu Utsumi
e8a0f01c8e Merge "Remove unused file path" into main am: 9c5b51e4f6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759105

Change-Id: I480d6fd45deb303cf0cf356f8347669b1a45cfff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 02:49:03 +00:00
Motomu Utsumi
9c5b51e4f6 Merge "Remove unused file path" into main 2023-09-22 02:06:54 +00:00
Spandan Das
71df5ce60d Merge "Create a bp2build converter for ndk_headers" into main am: 7ba007a3c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756529

Change-Id: I41d485cba0736761c9b7c0e5bc538384091d040b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 00:03:18 +00:00
Zi Wang
d0f497825c Merge "Allowlist grpc-java and its deps" into main am: 0dc9d095b4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754985

Change-Id: I454d7c3f6ef985a6f6c66fcfdbc1466645390851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 00:03:04 +00:00
Spandan Das
7ba007a3c6 Merge "Create a bp2build converter for ndk_headers" into main 2023-09-21 23:11:33 +00:00
Zi Wang
0dc9d095b4 Merge "Allowlist grpc-java and its deps" into main 2023-09-21 22:52:34 +00:00
Cole Faust
df432bae53 Merge "Decouple the target build variant from the platform" into main am: 747ecf4b1e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758405

Change-Id: I971f7983f3a3550269f85f96035003edba292ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 21:24:56 +00:00