Treehugger Robot
684cdf8a49
Merge "Allowlist packages instead of modules" into main am: 0e3da8162c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747533
Change-Id: I29f570158b77e6623909c76464f80631236e0b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 02:14:10 +00:00
Treehugger Robot
b3b682c911
Merge changes from topic "aidl_interface_hdrs" into main am: 7db882793b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734380
Change-Id: I218ea1e982cce0b07d67d6b5017ffe9417af0246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 02:13:44 +00:00
Jooyung Han
6fb6ccd5a2
Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main am: fc7ba26f1c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745100
Change-Id: I0459dd6821213d80abce039a4ec417363fac22f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 02:12:53 +00:00
Treehugger Robot
0e3da8162c
Merge "Allowlist packages instead of modules" into main
2023-09-12 01:53:49 +00:00
Treehugger Robot
7db882793b
Merge changes from topic "aidl_interface_hdrs" into main
...
* changes:
export SimpleModuleDoNotConvertBp2build for AIDL
export SetStubsForDynamicDeps for use in AIDL
2023-09-12 01:52:03 +00:00
Jooyung Han
fc7ba26f1c
Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main
...
* changes:
apex: validate vintf fragments in vendor APEX
apex: invoke `conv_linker_config validate` as validation
2023-09-12 01:39:07 +00:00
Zi Wang
28907d4680
Merge "Allowlist libprotobuf-java-full" into main am: 37aa1729b0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746115
Change-Id: I5a8d551d5f39932cbe9d44088d5bb75294019f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 22:59:44 +00:00
Treehugger Robot
c2ee8dc093
Merge "Revert "rustc-1.72.0 Build 10752340"" into main am: e79010c7ca
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747146
Change-Id: I70a48acfac4e5c757c308837f545a88e53810b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 22:58:30 +00:00
Zi Wang
37aa1729b0
Merge "Allowlist libprotobuf-java-full" into main
2023-09-11 22:50:40 +00:00
Treehugger Robot
e79010c7ca
Merge "Revert "rustc-1.72.0 Build 10752340"" into main
2023-09-11 22:29:04 +00:00
Vinh Tran
9226051310
Allowlist packages instead of modules
...
bp2build doesn't support allowlisting fully qualified module names. Hence, when modules such as libui and libbinder have duplicate names with corresponding fdo_profile modules, bp2build yields an error. See b/299663210 for more context.
Test: CI
Bug: 299663210
Change-Id: Ic175f5aea38139d34c5df8b9d02e7d82d9b3fc10
2023-09-11 18:15:35 -04:00
James Farrell
5d4be57cac
Revert "rustc-1.72.0 Build 10752340"
...
Revert submission 2736851-rust-1.72
Reason for revert: Breaks Mac builds
Change-Id: I94a30e61f9f717ad135fbef7ec7241730f583110
2023-09-11 20:01:49 +00:00
Treehugger Robot
d1d890d94b
Merge "rustc-1.72.0 Build 10752340" into main am: d15dcb7158
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736851
Change-Id: Idcf5de901e38f64f3022faa0174c4255c645583f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:55:23 +00:00
Treehugger Robot
d15dcb7158
Merge "rustc-1.72.0 Build 10752340" into main
2023-09-11 18:20:20 +00:00
Treehugger Robot
a833ddf80e
Merge "Remove link to internal doc in Soong AOSP README." into main am: 3d4e1eaa3f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747473
Change-Id: Id7a96f66f7a132c5b53ff92193f8d645bc9cabed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:08:11 +00:00
Cole Faust
acb8ca12a0
Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 7a05d1392a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746357
Change-Id: I6efc7cf9adabf83c9e0d86d49b56f7db73ec763f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:07:51 +00:00
Treehugger Robot
3d4e1eaa3f
Merge "Remove link to internal doc in Soong AOSP README." into main
2023-09-11 17:41:21 +00:00
Cole Faust
7a05d1392a
Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main
2023-09-11 17:25:18 +00:00
Jingwen Chen
fcf8a46385
Remove link to internal doc in Soong AOSP README.
...
Test: n/a
Change-Id: Ic0a997938a5dc4fbb46f401daa3cb3f6e8c2c54b
2023-09-11 08:24:23 +00:00
Sam Delmerico
130d75b6b3
export SimpleModuleDoNotConvertBp2build for AIDL
...
Bug: 298246873
Change-Id: I06ed7bb8fc1139731a2b48440a91aeb7f383efff
2023-09-10 19:05:54 +00:00
Sam Delmerico
dd6caa739d
export SetStubsForDynamicDeps for use in AIDL
...
Bug: 298249725
Change-Id: Ia93b320783eccf04fef167a26e2efb401c0e4236
2023-09-10 18:15:45 +00:00
Treehugger Robot
b6a5fe6bcc
Merge "Re-enable partition test" into main am: edbf854aa5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745801
Change-Id: I261046406a9fa429abd21e3655523e5f62cefdfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 23:42:20 +00:00
Treehugger Robot
edbf854aa5
Merge "Re-enable partition test" into main
2023-09-08 23:16:58 +00:00
Cole Faust
ded796030b
Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES
...
To maintain good backwards compatibility with the legacy partition
building behavior, allow actions to read
BUILD_BROKEN_INCORRECT_PARTITION_IMAGES so that we don't have to rerun
analysis.
Bug: 205632228
Test: Presubmits
Change-Id: I2b55c0143cbdaf010e6b5fd0c3d51d6930a94eff
2023-09-08 15:58:13 -07:00
Sam Delmerico
45b366c587
Merge changes from topic "revert-2605644-rulebuilder-ninja-vars-OAAWYCDDLT" into main am: 1d3740a274
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746977
Change-Id: Ie660c5611ea4938afa8abd0e64d1db788a811ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 21:20:28 +00:00
Sam Delmerico
78248229bc
Revert "add crate_root property to rust modules" am: 5162ff14fc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746976
Change-Id: Iaa642e2e66b26130e471bb3b1c0a8bd7b98451b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 21:20:24 +00:00
Sam Delmerico
f7ea23c683
Revert "allow Ninja variables in RuleBuilder API" am: 7b02d8159e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746975
Change-Id: I3fa604a507c4fe1370ca8706ed6edb1e80953cd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 21:20:15 +00:00
Sam Delmerico
1d3740a274
Merge changes from topic "revert-2605644-rulebuilder-ninja-vars-OAAWYCDDLT" into main
...
* changes:
Revert "add rust_toolchain_rustc_prebuilt module type"
Revert "add crate_root property to rust modules"
Revert "allow Ninja variables in RuleBuilder API"
2023-09-08 20:46:55 +00:00
Cole Faust
9a6fa98cd3
Re-enable partition test
...
Due to the series of recent reverts, it's working now.
Bug: 297269187
Test: m bazel_sandwich
Change-Id: I010a942918467713e08b900aec06c7011c40c3be
2023-09-08 12:00:39 -07:00
Cole Faust
afa3c434eb
Merge "Don't allow tree artifacts in mixed builds" into main am: 096b7e83bc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745561
Change-Id: I77d829abb34683de9e3d55ccd15ba41bd4f27fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 18:10:49 +00:00
Spandan Das
136fc20cc7
Merge "Write the list of ndk libraries to cc_toolchain/ndk_libs.bzl" into main am: ff8fb5c6cc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746125
Change-Id: I32adb172ae91850292a66c875f20a9865099ee83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 18:08:26 +00:00
Cole Faust
096b7e83bc
Merge "Don't allow tree artifacts in mixed builds" into main
2023-09-08 18:02:29 +00:00
Spandan Das
ff8fb5c6cc
Merge "Write the list of ndk libraries to cc_toolchain/ndk_libs.bzl" into main
2023-09-08 17:11:06 +00:00
Treehugger Robot
3a9ce197a9
Merge changes I86f30b99,I2769c0d5 into main am: 3fb2002c9e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746855
Change-Id: Ie61359bea67a9afdf9e1e2e3e29568edfeccba79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 16:31:33 +00:00
Treehugger Robot
e701757b08
Merge "Add all of hardware/interfaces/media to allowlist" into main am: b091d3b688
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746853
Change-Id: I19f41491f92834e3803998e134a84e140b603214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 16:31:16 +00:00
Sam Delmerico
7b02d8159e
Revert "allow Ninja variables in RuleBuilder API"
...
Revert submission 2605644-rulebuilder-ninja-vars
Reason for revert: b/299568218
Reverted changes: /q/submissionid:2605644-rulebuilder-ninja-vars
Change-Id: Ia738c100b8431dea6151939a800b992f877b5bb8
2023-09-08 16:10:54 +00:00
Sam Delmerico
5162ff14fc
Revert "add crate_root property to rust modules"
...
Revert submission 2605644-rulebuilder-ninja-vars
Reason for revert: b/299568218
Reverted changes: /q/submissionid:2605644-rulebuilder-ninja-vars
Change-Id: I17645fcff117909c09a016157235805f0974340b
2023-09-08 16:10:47 +00:00
Sam Delmerico
400749d1f0
Revert "add rust_toolchain_rustc_prebuilt module type"
...
Revert submission 2605644-rulebuilder-ninja-vars
Reason for revert: b/299568218
Reverted changes: /q/submissionid:2605644-rulebuilder-ninja-vars
Change-Id: Ic3d1ba7e8a61427b52f31cc3f187c9d5a7d9a7bb
2023-09-08 16:10:47 +00:00
Treehugger Robot
3fb2002c9e
Merge changes I86f30b99,I2769c0d5 into main
...
* changes:
Do not convert resource dirs without resources
Do not convert java libraries with core_platform
2023-09-08 16:04:45 +00:00
Treehugger Robot
b091d3b688
Merge "Add all of hardware/interfaces/media to allowlist" into main
2023-09-08 16:04:44 +00:00
Liz Kammer
33dddf5a7e
Do not convert resource dirs without resources
...
Previously we would convert to java_resources when there were no
resources and get an error.
Test: b build //external/libphonenumber/... --config=android
Change-Id: I86f30b993a3ffdb20000f6a4c5261e2c4c74263c
2023-09-08 09:44:00 -04:00
Liz Kammer
65942c8467
Do not convert java libraries with core_platform
...
Test: go bp2build tests
Change-Id: I2769c0d589c304caeb24a8ecba38a4a5ee6c63e5
2023-09-08 09:43:57 -04:00
Liz Kammer
4fd2edb638
Add all of hardware/interfaces/media to allowlist
...
Test: b build //hardware/interfaces/media/... //system/tools/hidl/... \
--config=android
Test: b build //hardware/interfaces/media/... //system/tools/hidl/... -k
Change-Id: Icc0f8ebb87b269c93e1b3b37e8c162772a2384ec
2023-09-08 09:39:37 -04:00
Jooyung Han
e615441832
apex: validate vintf fragments in vendor APEX
...
In Make, vintf fragments are checked with assemble_vintf. Since vendor
APEXes can have vintf fragments, perform the same check with vintf
fragments in APEX.
Bug: 299034304
Test: m test.bad2.com.android.hardware.wifi
(should fail if its module type is `apex`)
Change-Id: I2f9ed50066b9b499b3562bfa51214c1e375d5747
2023-09-08 21:36:00 +09:00
Jooyung Han
4bc102672a
apex: invoke conv_linker_config validate
as validation
...
`conv_linker_config validate` command is used to validate the linker
configuration embedded in APEX to detect common mistakes.
For example, when used in APEX, linker configuration can't set
provideLibs/requireLibs. For APEX, there are
provideSharedLibs/requireSharedLibs in APEX manifest for that purpose.
One might make mistake by setting provideLibs in linker config.
Now, when these unsupported properties are set, there'll be build-time
error like:
// set provideLibs key in com.android.art's linker config.
$ m com.android.art
...image.apex/etc/linker.config.pb: provideLibs is set. Use provideSharedLibs in apex_manifest
Bug: 264341796
Test: m com.android.art (see above)
Change-Id: Ibaf7322616ad333569e6d721680f3d72243402a2
2023-09-08 15:40:12 +09:00
Kiyoung Kim
07ecfae79e
Merge "Temporarily link Vendor APEX with vendor libbinder when VNDK deprecated" into main am: 86b9b13607
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745154
Change-Id: Id640ac2372baf89014673977f8fda161e3f95442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 04:32:20 +00:00
Firman Prayoga
a5d8a314db
Merge "Revert "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_I..."" into main am: e2e3172dba
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746514
Change-Id: I6d93f4c85d9da5336f51e612f5cdd43fd6181ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 04:31:46 +00:00
Firman Prayoga
0380f273af
Merge "Revert "Re-enable the partition test"" into main am: 20ae294850
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746103
Change-Id: I87ee174e0d57422fdab723b2fb0add6a3618fb97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 04:30:10 +00:00
Kiyoung Kim
86b9b13607
Merge "Temporarily link Vendor APEX with vendor libbinder when VNDK deprecated" into main
2023-09-08 04:21:17 +00:00
Firman Prayoga
e2e3172dba
Merge "Revert "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_I..."" into main
2023-09-08 04:06:57 +00:00