Commit Graph

73122 Commits

Author SHA1 Message Date
Treehugger Robot
2b99f4f4b0 Merge changes I86f30b99,I2769c0d5 into main am: 3fb2002c9e am: 3a9ce197a9 am: 0aa01115e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746855

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

Change-Id: I80e5258c37d04cd9df17c0d923ff138cb6c90273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 18:10:48 +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
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
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
Kiyoung Kim
99faf30724 Merge "Temporarily link Vendor APEX with vendor libbinder when VNDK deprecated" into main am: 86b9b13607 am: 07ecfae79e am: 60eba78127
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745154

Change-Id: Ibb23638e5ebf3441ab7564983c33521f0e8ae9dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 06:10:26 +00:00
Firman Prayoga
00f9506380 Merge "Revert "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_I..."" into main am: e2e3172dba am: a5d8a314db am: 4181728a55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746514

Change-Id: I4a2f861855fdab015df8f486c665515471363158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 06:10:08 +00:00
Firman Prayoga
ff10068c74 Merge "Revert "Re-enable the partition test"" into main am: 20ae294850 am: 0380f273af am: 293e4ba43b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746103

Change-Id: Ife073bb52c6d6667dea07b564547c6748231eec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 06:09:30 +00:00
Kiyoung Kim
60eba78127 Merge "Temporarily link Vendor APEX with vendor libbinder when VNDK deprecated" into main am: 86b9b13607 am: 07ecfae79e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745154

Change-Id: I19e45d77a983c9662b2488e918d3e33059b5ff8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 05:23:11 +00:00
Firman Prayoga
4181728a55 Merge "Revert "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_I..."" into main am: e2e3172dba am: a5d8a314db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746514

Change-Id: I177b8645f9be9bb34e0dcee12c9aaa94ce8beed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 05:22:53 +00:00
Firman Prayoga
293e4ba43b Merge "Revert "Re-enable the partition test"" into main am: 20ae294850 am: 0380f273af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746103

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

Change-Id: Ifdc476d7dd5558fc7d9416ca7bd536328865cb69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 02:10:37 +00:00
Sam Delmerico
c6c32decac add crate_root property to rust modules am: 553edff9dd am: fd574ccac5 am: 496f1655c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2656735

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

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

Change-Id: I74a7cd77a3142c0343dd1d063cee2d8848149a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 02:09:53 +00:00
Firman Prayoga
098b237f5e Revert "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_I..."
Revert submission 2736954-proper_installclean

Reason for revert: Potential culprit for build breakage b/299545346

Reverted changes: /q/submissionid:2736954-proper_installclean

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

Change-Id: Ieacfca1bfde5cbd0ba7b1b63dd23b6b8f6afd5df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 01:23:02 +00:00
Sam Delmerico
496f1655c9 add crate_root property to rust modules am: 553edff9dd am: fd574ccac5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2656735

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

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

Change-Id: I6ee83382fcdfb6602fce75b4a9b102fe39f711ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 01:22:21 +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
fd574ccac5 add crate_root property to rust modules am: 553edff9dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2656735

Change-Id: Ia01d983e8470215b68c0a48e8a98cff6664a84a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 00:32:06 +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
4c88c7bf75 Merge "bp2build: block src == name for prebuilt_* modules" into main am: 3f0aa4d618 am: c6d011630f am: e1aa92f416
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2740453

Change-Id: I25698cc7043d8a039d5c6b6affb57bc6e55085d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:27:58 +00:00
Wei Li
13fabb1488 Merge "Remove the diff resolved in aosp/q/topic:"install_symlink"" into main am: ebd3aa274b am: 3db5ac3b7a am: 6e86db5ad0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2743759

Change-Id: Icc1d8d03a972607c26a690620d11c3fd93f0235b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:27:22 +00:00
Treehugger Robot
22a19357b2 Merge "Remove multi-tree unit test" into main am: ce0b67c101 am: 4b1a9f132d am: 8b120f73a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2743756

Change-Id: I1828d89a245b74d2e9e869b465f4d20521a90127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:23:03 +00:00
Sam Delmerico
1f9bb26656 allow Ninja variables in RuleBuilder API
The RuleBuilder API would not expand Ninja variables because the
variables would be written verbatim to the sandbox manifest file. This
commit allows a rule to specify that the manifest file should be written
in an un-escaped format so that Ninja variables are expanded before
writing the manifest file.

Bug: 286077158
Test: rust sandboxing topic + go test
Change-Id: I1915431f6e24d04d343dacc213c9079674ec8251
2023-09-07 20:56:02 +00:00
Treehugger Robot
e1aa92f416 Merge "bp2build: block src == name for prebuilt_* modules" into main am: 3f0aa4d618 am: c6d011630f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2740453

Change-Id: I51eedb874e66bb2210fae6af0c73e47b80695be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 20:40:23 +00:00
Wei Li
6e86db5ad0 Merge "Remove the diff resolved in aosp/q/topic:"install_symlink"" into main am: ebd3aa274b am: 3db5ac3b7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2743759

Change-Id: I3918ab4981f40d6148aa1765ab8b9b04add22819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 20:40:12 +00:00
Treehugger Robot
8b120f73a6 Merge "Remove multi-tree unit test" into main am: ce0b67c101 am: 4b1a9f132d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2743756

Change-Id: Iebc0d639f536505472716e11cffd35caf2336567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 20:35:47 +00:00
Treehugger Robot
c6d011630f Merge "bp2build: block src == name for prebuilt_* modules" into main am: 3f0aa4d618
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2740453

Change-Id: I685e1e8c347ae18b76a288d11c1f4f98e821efa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 19:54:41 +00:00
Wei Li
3db5ac3b7a Merge "Remove the diff resolved in aosp/q/topic:"install_symlink"" into main am: ebd3aa274b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2743759

Change-Id: I3ebf1abf49d008ecf6a4708d8bc8d9db9e4be146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 19:54:01 +00:00
Treehugger Robot
4b1a9f132d Merge "Remove multi-tree unit test" into main am: ce0b67c101
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2743756

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

Change-Id: Icb364d2397b31a5d5b5dbc8710da4c3466b13b3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 19:50:31 +00:00