Commit graph

72717 commits

Author SHA1 Message Date
Alyssa Ketpreechasawat
33eb8c5a6d Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206 am: 40ed4395ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777308

Change-Id: Ia877e9178f877f696868222bba1e5f985a8b92d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:36:10 +00:00
Xin Li
64e0299ecf [automerger skipped] Merge "Merge Android 14" into main am: 5c7d0cfb7d -s ours am: 0a5d8bac49 -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: I411c4295715d01ded52649057e9fdd903bb1a4b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:03:13 +00:00
Xin Li
1044e8491a [automerger skipped] Merge Android 14 am: 5a38034916 -s ours am: 91b0c64df5 -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: Id284b6151b56a2f6207dbd3c77e4c490f5cea3c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:43 +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
Treehugger Robot
84479cb9d5 Merge "Denylist genrules that fail to build with sandboxing" into main am: c6f50151d0 am: babb8c089e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776072

Change-Id: Id3722648d9e10ac6c3a725099e0cae046eb54704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 06:44:09 +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
e70e2b0b5d Merge "Disable hiddenapi check for building from prebuilts." into main am: 5e0ee313e1 am: 7d2beceffd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761821

Change-Id: Ie0a32bc186d434b85149dbc2a9ba50afdaab30b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 01:02:50 +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
b55cc83aa5 Merge "Add support for java_library proto plugin in bp2build" into main am: b0f3ff43e5 am: 674022ced0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768495

Change-Id: I383f1241634231f84aac1dd17a4743b28a16c473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 23:42:54 +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
Jason Wu
9198d768dd Denylist libhardware to pass bp2build-incremental am: 4db4f814bb am: f802d7711a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776028

Change-Id: I4795fa693f1b0e6516aa3c0961a7b7bc6a6b5671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 21:30:16 +00:00
Christopher Parsons
8a4f82bba6 Merge "Test changes to prepare for allowlist v2" into main am: c774c92f57 am: c80520b885
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775587

Change-Id: Ida1eb7eb8af24cc83b3fee1c102940c742e44f16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 21:30:07 +00:00
Christopher Parsons
729b855d52 Merge "Skip certain problematic deps" into main am: 9eb4efa094 am: 8bf242d437
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773564

Change-Id: I3803c3b3426f4bec39a415e112b0843070c48265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 21:29:48 +00: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
1dd1c7712e Merge changes I5c7f1fc1,I6015581c into main am: 0b5a877f21 am: 9994462ccb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774749

Change-Id: I35735b5fd49d1b1ac65bff4a71c1070e4e089534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 19:22:53 +00:00
Christopher Parsons
f14e69b82a Merge "Small readability refactor for bp2buildDepsMutator." into main am: d9cc9ec2ea am: 7c738120f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774747

Change-Id: I0418fbbe976cf8a6a2db71615885cdbdb4d735e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 19:22:33 +00: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
Trevor Radcliffe
00c6285a26 Merge "Implement bp2build for Sysprop Java" into main am: e3e930d260 am: e66b6c5bc3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769439

Change-Id: I03ea45a9b6f7973ad770e57613a1eafca3a77ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 16:24:25 +00:00
Elliott Hughes
67c1b30ec6 Merge "riscv64: assume fast unaligned access." into main am: 3fb5c15adf am: 6014bf35bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734373

Change-Id: Ic33b6510e252af1313738843df619d7d42cdfa3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 16:24:05 +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
Jingwen Chen
07438fd01b Merge "Delete some api_bp2build dead code." into main am: 26d852a320 am: a2a847ff0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774750

Change-Id: I39b40b3bf0f9afd81c4bd8e0285dd593835916c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 15:05:57 +00:00
Elliott Hughes
3fb5c15adf Merge "riscv64: assume fast unaligned access." into main 2023-10-05 15:03:02 +00:00
Jingwen Chen
a2a847ff0f Merge "Delete some api_bp2build dead code." into main am: 26d852a320
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774750

Change-Id: I8bf4e7a1f85f3396e7ea0daa33261f02bebf742f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 14:51:07 +00:00
Alix Espino
00b7ab6ad0 Merge "use message in android.AssertStringMatches()" into main am: b7a6720611 am: 5511afdcaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773304

Change-Id: I76a3e39ebbb26dc8fe8538ab79bfed6ad0cebeab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 14:50:58 +00:00
Kousik Kumar
169678e288 Merge "Update symlinks in output directory when TOP dir changes" into main am: a902250962 am: 422bad6f88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757787

Change-Id: I28f8edc713d172af2094a214f3db06467ee0e7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 14:50:15 +00:00
Jingwen Chen
26d852a320 Merge "Delete some api_bp2build dead code." into main 2023-10-05 14:39:33 +00:00
Alix Espino
5511afdcaa Merge "use message in android.AssertStringMatches()" into main am: b7a6720611
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773304

Change-Id: I2536c55cdebb288526c1153ab97e46a47e676dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 14:19:29 +00:00