Alyssa Ketpreechasawat
fc3ab39cae
Merge "Revert "Revert "Disable hiddenapi check for building from prebuilts.""" into main am: 2711ce2e1f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775656
Change-Id: Ia8f61e5c775856f54107b273ed5d1b88a976afc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 19:28:15 +00:00
Alyssa Ketpreechasawat
2711ce2e1f
Merge "Revert "Revert "Disable hiddenapi check for building from prebuilts.""" into main
2023-10-06 19:17:40 +00:00
Dan Albert
9f98477e8f
Merge "Fix error message to still be an error." into main am: dbd4a25cf7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775983
Change-Id: Ife1a7a03e8180f03b1ac6ce848def167171a349a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 19:09:34 +00:00
Dan Albert
dbd4a25cf7
Merge "Fix error message to still be an error." into main
2023-10-06 18:55:32 +00:00
Vinh Tran
59ffcbd8de
Merge "Export device arm64 rust flags to Bazel" into main am: 001ec85bcc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773604
Change-Id: Ica62ebb44c14827485d72dd71308e18e3ca1078c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 18:53:08 +00:00
Mark Dacek
5428ba4965
Merge "Revert "Revert "Modify symlink_forest to rerun when soong_build has changed.""" into main am: e0b6329384
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771971
Change-Id: Ifb9b9bfdb867bfc61d424539d76cf161db26f792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 18:51:41 +00:00
Vinh Tran
001ec85bcc
Merge "Export device arm64 rust flags to Bazel" into main
2023-10-06 17:50:15 +00:00
Mark Dacek
e0b6329384
Merge "Revert "Revert "Modify symlink_forest to rerun when soong_build has changed.""" into main
2023-10-06 17:34:47 +00:00
Treehugger Robot
633fde4719
Merge "Remove unnecessary arch variant for patch module" into main am: aa46295842
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775981
Change-Id: Ifba6c7e33083b7b1873354470b5bcd208d357702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 16:12:02 +00:00
Treehugger Robot
aa46295842
Merge "Remove unnecessary arch variant for patch module" into main
2023-10-06 15:20:20 +00:00
Christopher Parsons
1140168066
Merge "Dont write data attrs for cc lib rules" into main am: f7fe400fbc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773605
Change-Id: I475de8a01516bf66fbd46c3ccc66ddfe96dc8168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 15:01:39 +00:00
Christopher Parsons
f7fe400fbc
Merge "Dont write data attrs for cc lib rules" into main
2023-10-06 14:09:07 +00:00
Alyssa Ketpreechasawat
48828a1837
Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main am: 5cdd22700e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775629
Change-Id: Idffc8e2b98543b4f67aabc0ee066603bb55c2791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 12:10:01 +00:00
Alyssa Ketpreechasawat
5cdd22700e
Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main
2023-10-06 10:56:29 +00:00
Alyssa Ketpreechasawat
40ed4395ab
Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777308
Change-Id: I5e5dbbfe5a744520ac519799540174b6f81f7f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:16:37 +00:00
Xin Li
0a5d8bac49
[automerger skipped] Merge "Merge Android 14" into main am: 5c7d0cfb7d
-s ours
...
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775985
Change-Id: I4879ee8e881a980a8f862835ce9a8703b8178545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:56:26 +00:00
Xin Li
91b0c64df5
[automerger skipped] Merge Android 14 am: 5a38034916
-s ours
...
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775985
Change-Id: Ida05ed512d0e3d7de12bfd4254a23d1c76a3f8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:40 +00:00
Alyssa Ketpreechasawat
34ab8792c5
Revert "Revert "Disable hiddenapi check for building from prebuilts.""
...
This reverts commit bb6b813b1d
.
Reason for revert: resubmit
Change-Id: I0ded78ed1a355654fa142351b95cd51f48c2186e
2023-10-06 07:01:23 +00:00
Alyssa Ketpreechasawat
affbb8d206
Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main
2023-10-06 06:18:18 +00:00
Treehugger Robot
babb8c089e
Merge "Denylist genrules that fail to build with sandboxing" into main am: c6f50151d0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776072
Change-Id: Ifae6e822b299819e5e21ef93d9ee790c2e96d3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 05:52:57 +00:00
Xin Li
5c7d0cfb7d
Merge "Merge Android 14" into main
2023-10-06 05:38:53 +00:00
Treehugger Robot
c6f50151d0
Merge "Denylist genrules that fail to build with sandboxing" into main
2023-10-06 05:27:32 +00:00
Cole Faust
8a25345b7d
Denylist genrules that fail to build with sandboxing
...
Bug: 290816499
Test: run genrule_sandbox_test.py with a local change to check all genrules in the tree
Change-Id: Id18b801c2306dd59b5b593b004b513b578ce3705
2023-10-06 05:12:07 +00:00
Alyssa Ketpreechasawat
bb6b813b1d
Revert "Disable hiddenapi check for building from prebuilts."
...
Revert submission 2761821-suppress-hiddenapi-check
Reason for revert: have some typo - break next build
Reverted changes: /q/submissionid:2761821-suppress-hiddenapi-check
Change-Id: I9fce1e1a9389d58928f1eec50c0eaf016f5f63ac
2023-10-06 03:42:34 +00:00
Alyssa Ketpreechasawat
7d2beceffd
Merge "Disable hiddenapi check for building from prebuilts." into main am: 5e0ee313e1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761821
Change-Id: I2fe8530611dd15b6fb28f4cec78da11dac04abc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 00:31:45 +00:00
Alyssa Ketpreechasawat
5e0ee313e1
Merge "Disable hiddenapi check for building from prebuilts." into main
2023-10-05 23:51:29 +00:00
Zi Wang
674022ced0
Merge "Add support for java_library proto plugin in bp2build" into main am: b0f3ff43e5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768495
Change-Id: I6071624f0790f4fda9b2bdb1f9dd4539d17f2a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 23:09:17 +00:00
Zi Wang
b0f3ff43e5
Merge "Add support for java_library proto plugin in bp2build" into main
2023-10-05 22:32:53 +00:00
Xin Li
5a38034916
Merge Android 14
...
Bug: 298295554
Merged-In: Idc0ff2f20e54b81cfdf61472a72e9cb027f60554
Change-Id: I6c032acf0826b910d045a7a23373597c78a5ee0a
2023-10-05 15:31:31 -07:00
Chris Parsons
7123cc5370
Dont write data attrs for cc lib rules
...
The data attributes for cc library rules is dropped by their starlark
macros, so serves no real purpose. Furthermore, this unused dependency
proves problematic for allowlist v2, as there are many cases at HEAD
where the corner-case "requires" dependency would otherwise mark a module
as unconvertible.
Fixes: 303307456
Test: New unit test
Test: Manual verification to unblock allowlist v2 `bp2build.sh` runs in
AOSP
Change-Id: I6ca6104b958d2b428fc2ca5b3fa794106571acca
2023-10-05 22:07:28 +00:00
Dan Albert
5b2fd587c0
Fix error message to still be an error.
...
Bug: http://b/156513478#comment43
Test: m ndk, actually checked that it actually failed
Change-Id: I1951ddfee3bef7d06ab4561e445d75358e5a4abf
2023-10-05 21:45:41 +00:00
Liz Kammer
0a470a3c14
Remove unnecessary arch variant for patch module
...
Test: CI
Change-Id: Ibc058407ffb09afa38d9248f4391019e8786602b
2023-10-05 17:02:00 -04:00
Jason Wu
f802d7711a
Denylist libhardware to pass bp2build-incremental am: 4db4f814bb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776028
Change-Id: I5b40238570c634e8ba3f06b7b3b2e5d8afdf944d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 20:58:59 +00:00
Christopher Parsons
c80520b885
Merge "Test changes to prepare for allowlist v2" into main am: c774c92f57
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775587
Change-Id: I1a7f588d1a728996c2b4bd3c6eba671f317dbdb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 20:58:50 +00:00
Christopher Parsons
8bf242d437
Merge "Skip certain problematic deps" into main am: 9eb4efa094
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773564
Change-Id: Id357a2b4c6aec984eb6574031babd1cb97c2214e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 20:58:39 +00:00
Jason Wu
4db4f814bb
Denylist libhardware to pass bp2build-incremental
...
Test: bp2build.sh and abtd test.
Bug: 303534112
Change-Id: I6913818619a555939f4dbfad99602dce420d888b
2023-10-05 20:52:01 +00:00
Christopher Parsons
c774c92f57
Merge "Test changes to prepare for allowlist v2" into main
2023-10-05 20:30:23 +00:00
Christopher Parsons
9eb4efa094
Merge "Skip certain problematic deps" into main
2023-10-05 20:27:00 +00:00
Zi Wang
dbaf6a9dd0
Add support for java_library proto plugin in bp2build
...
Test: Added unit test and CI
Bug: 303064670
Change-Id: Idb96ac322aafcb6789ea2002b84a6905d5ec488f
2023-10-05 12:53:23 -07:00
Christopher Parsons
9994462ccb
Merge changes I5c7f1fc1,I6015581c into main am: 0b5a877f21
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774749
Change-Id: I15bb29036ebefe0093f3fdcc6f5ec7094f48f1d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 18:47:59 +00:00
Christopher Parsons
7c738120f9
Merge "Small readability refactor for bp2buildDepsMutator." into main am: d9cc9ec2ea
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774747
Change-Id: Ie321473307fb048ece13876ff5987884667a0f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 18:47:40 +00:00
Christopher Parsons
0b5a877f21
Merge changes I5c7f1fc1,I6015581c into main
...
* changes:
Fix comment for Bp2buildDepsMutator config.
Use parameter name hint for BazelLabelModuleDepsWithFn's markAsDeps.
2023-10-05 18:11:28 +00:00
Christopher Parsons
d9cc9ec2ea
Merge "Small readability refactor for bp2buildDepsMutator." into main
2023-10-05 18:10:26 +00:00
Chris Parsons
44215bc31d
Skip certain problematic deps
...
These are hacks to unblock allowlist v2. See attached bugs.
Bug: 303307672
Bug: 303310285
Test: Manually tested to unblock `m nothing` with allowlist v2 on AOSP
Change-Id: I076a96134118106b44e105db98617ffb9f33bca5
2023-10-05 17:54:34 +00:00
Chris Parsons
d078337796
Test changes to prepare for allowlist v2
...
This implements a number of in-place unit test changes to prepare for
some fundamental changes to bp2build ("allowlist v2"). This will change
bp2build so that rdeps of unconverted or missing modules will not be
converted by bp2build.
Bug: 301312260
Test: Unit tests
Test: Unit tests, with a local copy of allowlist v2 on
Change-Id: I8c8c0a24ba173e213fffcb0f8d7e99845705f4a7
2023-10-05 17:51:44 +00:00
Mark Dacek
b2441c52a4
Revert "Revert "Modify symlink_forest to rerun when soong_build has changed.""
...
This reverts commit aa5cc2cd6a
.
Reason for revert: Fixed the bug in the original draft.
There was an error in how we compared the file's MTime to the
file's contents.
Bug: 300288299
Test: presubmits
Test: build/soong/tests/run_integration_tests.sh
Change-Id: I9e53432c0842c0b9fc13fe20d30ce9af37640c7f
2023-10-05 17:11:50 +00:00
Alyssa Ketpreechasawat
238d1be1da
Revert "Added new framework-pdf jar inside MediaProvider module"
...
Revert submission 2759049-framework-pdf
Reason for revert: it blocks us from enabling prebuilts in next target in main (go/stale-mainline-prebuilts for more info)
Reverted changes: /q/submissionid:2759049-framework-pdf
Change-Id: I7e6d002643d0a3c08cc868d827c60a6ed7e8712d
2023-10-05 16:09:32 +00:00
Trevor Radcliffe
e66b6c5bc3
Merge "Implement bp2build for Sysprop Java" into main am: e3e930d260
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769439
Change-Id: I9d5ca5c4c0ec40b0e56183d517af326420b3224e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 16:09:18 +00:00
Trevor Radcliffe
e3e930d260
Merge "Implement bp2build for Sysprop Java" into main
2023-10-05 15:59:53 +00:00
Elliott Hughes
6014bf35bc
Merge "riscv64: assume fast unaligned access." into main am: 3fb5c15adf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734373
Change-Id: I05345473ece976678692608c5cac4b22412e5424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 15:51:58 +00:00