Commit Graph

71964 Commits

Author SHA1 Message Date
Jooyung Han
c5a20552ea Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main am: fc7ba26f1c am: 6fb6ccd5a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745100

Change-Id: I9ac6b120bd3acf22ebf19a31449159d2aa1cd6aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:05:46 +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
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
9b4837bddf Merge "Allowlist libprotobuf-java-full" into main am: 37aa1729b0 am: 28907d4680
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746115

Change-Id: I57c1d7f56fc628d84057339dc1001bf861735074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 23:51:10 +00:00
Treehugger Robot
ed48777d01 Merge "Revert "rustc-1.72.0 Build 10752340"" into main am: e79010c7ca am: c2ee8dc093
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747146

Change-Id: Ie68ad1a8032ab337b53ef44cfb54d8e8d8bb56ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 23:50:47 +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
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
353f11f753 Merge "rustc-1.72.0 Build 10752340" into main am: d15dcb7158 am: d1d890d94b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736851

Change-Id: I455ea25023737823051090d4bb95ab5afc0bb1df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:01:27 +00:00
Treehugger Robot
017d82f2f1 Merge "Remove link to internal doc in Soong AOSP README." into main am: 3d4e1eaa3f am: a833ddf80e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747473

Change-Id: If705d10544cbad6c770202cedde91ee9cb294bce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:00:53 +00:00
Cole Faust
937ae76394 Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 7a05d1392a am: acb8ca12a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746357

Change-Id: Icfd6c48dbc0d4910b511939ba62ab5f6de8ef652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:59:19 +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
Treehugger Robot
db25146c25 Merge "Re-enable partition test" into main am: edbf854aa5 am: b6a5fe6bcc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745801

Change-Id: Icf4625cf9c7f481cf3becf10b623be81a1015236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-09 00:36:39 +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
74382d9317 Merge changes from topic "revert-2605644-rulebuilder-ninja-vars-OAAWYCDDLT" into main am: 1d3740a274 am: 45b366c587
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746977

Change-Id: I5be8a4f026c27d0b49994767658401694fc694a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 22:11:08 +00:00
Sam Delmerico
d88ff2768d Revert "add crate_root property to rust modules" am: 5162ff14fc am: 78248229bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746976

Change-Id: Ia8e69e3162d9f7b49b1cb372ea6c481cc2c6755e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 22:11:04 +00:00
Sam Delmerico
955c1bd429 Revert "allow Ninja variables in RuleBuilder API" am: 7b02d8159e am: f7ea23c683
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746975

Change-Id: If7cdcd82855441309d1792814d17de1bb8d1b2b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 22:10:56 +00: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
0ce68376e5 Merge "Don't allow tree artifacts in mixed builds" into main am: 096b7e83bc am: afa3c434eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745561

Change-Id: Iea23fed9436d30c419ebe09d7da4161a1519843d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 19:01:29 +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
Spandan Das
4508832f66 Merge "Write the list of ndk libraries to cc_toolchain/ndk_libs.bzl" into main am: ff8fb5c6cc am: 136fc20cc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746125

Change-Id: Ieb8966910e64ecd1b82fb5e95296be4c85c97377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 18:59:15 +00: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
Treehugger Robot
0aa01115e4 Merge changes I86f30b99,I2769c0d5 into main am: 3fb2002c9e am: 3a9ce197a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746855

Change-Id: I5d9542e0bda630bf785f8a613396f6997fee71e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 17:23:54 +00:00
Treehugger Robot
b242a36acf Merge "Add all of hardware/interfaces/media to allowlist" into main am: b091d3b688 am: e701757b08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746853

Change-Id: I7266dd1409baff4af21e56b5ec7d94d63fb1fa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 17:23:39 +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