Commit Graph

7613 Commits

Author SHA1 Message Date
Treehugger Robot
ccceb1b092 Merge "Allowlist more targets for framework" into main am: ece322f640
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745834

Change-Id: I1c8531acc3f0dd62291b5cc77a6625f11d9d3236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 22:08:24 +00:00
Liz Kammer
b70eae04ce Allowlist more targets for framework
Test: bp2build.sh
Change-Id: I4bd080dd795f40d9095157fe4ba4ec7f0e251757
2023-09-13 11:28:02 -04:00
Liz Kammer
034f338494 Merge "Sort do not convert for unconverted deps" into main am: 7ebb91a449 am: b6d89afe2d am: 7e36cd8da5 am: f2d797f844 am: 2886c41b5c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744700

Change-Id: I4f1ac924c9ff169b51b8d39ae003b60f465a681c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 17:54:18 +00:00
Liz Kammer
b6d89afe2d Merge "Sort do not convert for unconverted deps" into main am: 7ebb91a449
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744700

Change-Id: Id2fb4d9070d0880186c1c65c55b106ad26fa005b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 15:22:07 +00:00
Liz Kammer
f673c2ea9f Sort do not convert for unconverted deps
Test: n/a
Change-Id: Id86986f17d23fe47e47b303a1828478b8e887513
2023-09-12 09:08:17 -04:00
Treehugger Robot
b75d122ae0 Merge "Allowlist packages instead of modules" into main am: 0e3da8162c am: 684cdf8a49 am: fcbdddd404 am: e35ea9fd3a am: d333324251
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747533

Change-Id: I0bdfd16efa1f61b3cf5bb4196fbd3f9f8584207c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 05:34:19 +00:00
Zi Wang
749144d3c5 Merge "Allowlist libprotobuf-java-full" into main am: 37aa1729b0 am: 28907d4680 am: 9b4837bddf am: b7cf526f77 am: 4a8d29f8bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746115

Change-Id: Id36c7704816a31d440272caaa9623692fcda4b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 02:15:30 +00:00
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
0e3da8162c Merge "Allowlist packages instead of modules" into main 2023-09-12 01:53:49 +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
Zi Wang
37aa1729b0 Merge "Allowlist libprotobuf-java-full" into main 2023-09-11 22:50:40 +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
Cole Faust
20d5b2c64a Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 7a05d1392a am: acb8ca12a0 am: 937ae76394 am: 6732deca4b am: ca9e576597
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746357

Change-Id: I899e3e0fd25d0d532701dc927bffffc7b0d4c63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:22:33 +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
Cole Faust
7a05d1392a Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main 2023-09-11 17:25:18 +00:00
Yu Liu
2cc802a442 Support aconfig_declarations, aconfig_values and aconfig_value_set
Bug: 297356603
Test: Unit tests
Change-Id: I2f797578a35322440db0f281b4d46b6652512e00
2023-09-09 12:33:40 -07:00
Treehugger Robot
d02813f79c Merge "Re-enable partition test" into main am: edbf854aa5 am: b6a5fe6bcc am: db25146c25 am: 95be339aa6 am: 0a2fb5895f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745801

Change-Id: I0f4dfbbf5581088698724f7f4f25f8af137368d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-09 02:57:01 +00:00
Sam Delmerico
3a941da6a3 Merge changes from topic "revert-2605644-rulebuilder-ninja-vars-OAAWYCDDLT" into main am: 1d3740a274 am: 45b366c587 am: 74382d9317 am: a450e55be4 am: 4bc8c4f261
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746977

Change-Id: I6024e0e7cb99da44826ee49eaf9e3905b3b89a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-09 00:36:28 +00:00
Sam Delmerico
5db018629f Revert "allow Ninja variables in RuleBuilder API" am: 7b02d8159e am: f7ea23c683 am: 955c1bd429 am: 120044066a am: 0df1c33529
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746975

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

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

Change-Id: I5e89809a5b4a60e0a1244c3522b94f4fabb0ed9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 19:45:36 +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
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
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
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
Firman Prayoga
8675cbfcef Merge "Revert "Re-enable the partition test"" into main am: 20ae294850 am: 0380f273af am: 293e4ba43b am: ff10068c74 am: 47366c5ee1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746103

Change-Id: I527b0935b99804fcd2dc736de852395a19cc9af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 07:44:13 +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
Firman Prayoga
20ae294850 Merge "Revert "Re-enable the partition test"" into main 2023-09-08 04:02:58 +00:00
Treehugger Robot
b7f1e4e06f Merge changes from topics "rulebuilder-ninja-vars", "rustc_prebuilt_build_tool" into main am: 9abcf649a7 am: 3940f12384 am: 98b7e908ff am: b69f3832a0 am: 2de5a015f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2605644

Change-Id: I5529d02c34a9d7649f359ee6387907a6bbaf0d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 03:44:50 +00:00
Sam Delmerico
1a4a25eae9 add rust_toolchain_rustc_prebuilt module type am: b45c844ce7 am: 28ef26653e am: e82a8a05fe am: 019565f598 am: 8c5db10e9f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2654319

Change-Id: Ibd6f5da9807ff6d29f4389237fa587f2545bc0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 03:44:38 +00:00
Cole Faust
912c88f308 Merge "Re-enable the partition test" into main am: 509ca8dfaf am: 48bb7636d7 am: 4022b6b137 am: 466df4b5c6 am: b4fe06c711
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746116

Change-Id: I60b5cddfea8244ddfc64c627fe10cf5b196f54fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 03:44:04 +00:00
Cole Faust
5abc4bfb6e Revert "Re-enable the partition test"
Revert submission 2745814-bazel_staging_dir_file_list

Reason for revert: So we can revert the staging directories change

Reverted changes: /q/submissionid:2745814-bazel_staging_dir_file_list

Change-Id: I3e997f29efcaf68ef102d33595609dd709f43d7d
2023-09-08 03:15:32 +00:00
Treehugger Robot
3940f12384 Merge changes from topics "rulebuilder-ninja-vars", "rustc_prebuilt_build_tool" into main am: 9abcf649a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2605644

Change-Id: I31d2d73a069bd8d67e82e59c70ea0f94c15e5fb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 00:32:09 +00:00
Sam Delmerico
28ef26653e add rust_toolchain_rustc_prebuilt module type am: b45c844ce7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2654319

Change-Id: I451980fd7b155c389fb0eafc5ff0842ab50029f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 00:31:58 +00:00
Cole Faust
48bb7636d7 Merge "Re-enable the partition test" into main am: 509ca8dfaf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746116

Change-Id: I9b80fa78c616be5b93cba73136fdc545cbfbfb0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 00:30:52 +00:00
Treehugger Robot
9abcf649a7 Merge changes from topics "rulebuilder-ninja-vars", "rustc_prebuilt_build_tool" into main
* changes:
  allow Ninja variables in RuleBuilder API
  add crate_root property to rust modules
  add rust_toolchain_rustc_prebuilt module type
2023-09-08 00:10:18 +00:00
Cole Faust
509ca8dfaf Merge "Re-enable the partition test" into main 2023-09-07 23:35:01 +00:00
Treehugger Robot
ba874c71d1 Merge "bp2build: block src == name for prebuilt_* modules" into main am: 3f0aa4d618 am: c6d011630f am: e1aa92f416 am: 4c88c7bf75 am: 109406f64a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2740453

Change-Id: I690a5484d4e499bbf61e747a7af8c240802bd300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 23:06:43 +00:00
Cole Faust
cb400c2c79 Tempoarily disable the partition test am: 7dcfeb8100 am: 12db00f363 am: 9a79429a3b am: 889b28db74 am: e2af9bd168
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745555

Change-Id: I267b33c44bcb79241e86e72ef7dbf8ac8163f004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:26:58 +00:00