StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,289 Commits 1 Branch 0 Tags
b22fb3598107e8ec8851f901b03404f24e812d3a
Commit Graph

7613 Commits

Author SHA1 Message Date
Cole Faust
659bc3c115 Merge "Emit a system image target for the current product" into main am: 71aa535721 am: 7c10bc2e58 am: 8f93602ae4 am: 10fd5a6d7c am: c5d316c181 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758087

Change-Id: I347fab14aa5a4830f1dc7ceb76de89c3df77ae00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 21:50:29 +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
2f21437bd3 Merge changes from topics "revert-2629131-sandbox-rust-inputs-JRFPQTIPEY", "revert-2758566-WBNIADIEXA" into main am: 40c7bae1df am: b0fe75a004 am: 4a93d15ba8 am: 88845e990f am: 22e4687114 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760293

Change-Id: I0722e66dea55fb039528feb763bdaeff5e3cc868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 08:41:30 +00:00
Wen-yi Chu
4511a41e72 Revert^3 "allow Ninja variables in RuleBuilder API" am: 789a7e0883 am: 60b2da8b43 am: 8fa4fbe4d2 am: c5a4541fc4 am: 24d0ba5846 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760291

Change-Id: Ieae9ee57d7fd6febec942d1aa2057621cc0ae35f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 08:41:25 +00:00
Wen-yi Chu
be0f65fe06 Revert "conditionally escape rule builder command" am: 53ed08aec0 am: 5de40ab122 am: 5c4d9f69c1 am: 9e4d20c006 am: 1f7ab9560f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760290

Change-Id: I63cd85d8876ebc1f55a59216811ed3e7b9c0d54a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 08:41:23 +00:00
Wen-yi Chu
deb92e11f6 Revert "support sandboxed rust rules" am: 41326c1f41 am: 5a2dfb3d25 am: bc8ae377d4 am: 7085201bde am: c9d7af8c80 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760289

Change-Id: I9e3c3323729ea7d1cd87e195dc6da9a3739186e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 08:41:20 +00:00
Zi Wang
4412c220f1 Merge "Pass java_library libs and static_libs to java_*_proto_library" into main am: 7c5b6d5273 am: ada4983493 am: 894e5ee4c9 am: fcd20e619b am: 1e692ed087 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759538

Change-Id: Icd66717386ae6332e2fd7d9cdd0850428563e10c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 08:40:11 +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
Treehugger Robot
88ba38f280 Merge "Switch bp2build mutator to bottom up" into main am: 11b20b2993 am: febe41d738 am: be9f6850a7 am: 9660ccbe20 am: 9edfb56e62 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760865

Change-Id: I0cee13a821d91dd6dbd9a2393544e72060ab4fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 05:00:21 +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
Wonsik Kim
547e2eb6e4 Merge "Add libcodec2_aidl into allowlist" into main am: ee03e4e577 am: 9ca0761342 am: 671f8e5bbb am: 908a18dc57 am: 2de7350408 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734654

Change-Id: I22db889d26c676cdfbd192b5d0d029b76f7ebfa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 00:36:23 +00:00
Treehugger Robot
11b20b2993 Merge "Switch bp2build mutator to bottom up" into main 2023-09-23 00:05:47 +00:00
Christopher Parsons
2ca693f6fd Merge "Handle already existing targets of different name" into main am: 68a3d9b33e am: 07eb212463 am: c85ebf33fe am: 51da529229 am: ee4348d7b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759611

Change-Id: Ibb87b3f1134185e2d78bfc2b5f48b119152b4ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 23:33:45 +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
476ba87553 Merge "Remove unused file path" into main am: 9c5b51e4f6 am: e8a0f01c8e am: ea5f47b643 am: 24a2256380 am: ab9cc55552 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759105

Change-Id: Ib505b7aab02ffa9883f9fe6a8dda4f3bcfcdd755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 06:28:58 +00:00
Spandan Das
8efeaa51f3 Merge "Create a bp2build converter for ndk_headers" into main am: 7ba007a3c6 am: 71df5ce60d am: 50910138fa am: 219eeba24a am: aa7f560311 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756529

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

Change-Id: Ib2be6a40bb5e14f1247ec4bde9b3180b87af6b1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 03:42:48 +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
Cole Faust
8c975fe097 Merge "Decouple the target build variant from the platform" into main am: 747ecf4b1e am: df432bae53 am: 75e0bbda5d am: 9ebc3db2aa am: abd4e112fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758405

Change-Id: I1c81ece8ab89688cbfdf2f3945e77b41d2cd34b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 01:00:05 +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
Cole Faust
747ecf4b1e Merge "Decouple the target build variant from the platform" into main 2023-09-21 21:18:47 +00:00