Jason Wu
638472c34a
Denylist libhardware to pass bp2build-incremental am: 4db4f814bb
am: f802d7711a
am: 9198d768dd
am: 0700598790
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776028
Change-Id: Id1004faf2299a15a3005799a1210113e44ec987b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 22:36:57 +00:00
Christopher Parsons
066f9c89db
Merge "Test changes to prepare for allowlist v2" into main am: c774c92f57
am: c80520b885
am: 8a4f82bba6
am: fbb03a2b57
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775587
Change-Id: If00d875f3d1172d2659066c868839287f6b1c277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 22:36:11 +00:00
Christopher Parsons
cac2ae7b27
Merge "Skip certain problematic deps" into main am: 9eb4efa094
am: 8bf242d437
am: 729b855d52
am: 29bca3bdc8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773564
Change-Id: Ica2e88056659107106648b03a00450cf229c7654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 22:35:05 +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
0700598790
Denylist libhardware to pass bp2build-incremental am: 4db4f814bb
am: f802d7711a
am: 9198d768dd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776028
Change-Id: Id9d9fefb88a09d2db2332644019680f05bfeb780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 22:07:48 +00: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
Christopher Parsons
fbb03a2b57
Merge "Test changes to prepare for allowlist v2" into main am: c774c92f57
am: c80520b885
am: 8a4f82bba6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775587
Change-Id: I63188f147a67aabc38428a0c8f710af4d396cc79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 22:05:53 +00:00
Christopher Parsons
29bca3bdc8
Merge "Skip certain problematic deps" into main am: 9eb4efa094
am: 8bf242d437
am: 729b855d52
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773564
Change-Id: I3c4165ee39fcf4aa7c2f5e9648b71d847eb9226c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 22:04:06 +00:00
Elliott Hughes
3bba0e4bfe
Have the sanitizers trap rather than abort.
...
abort() seems friendlier, but in practice it puts a couple of irrelevant
libc.so frames on the top of the stack trace and clobbers all the
registers that might have helped remotely debug a sanitizer failure.
Let's switch to trapping directly in the sanitized code instead.
Bug: http://b/298741930
Test: treehugger
Change-Id: I6c971920c8506f97133749aaddd73b8cea6a12bc
2023-10-05 14:51:28 -07: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
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
Liz Kammer
6077263084
Update Headers_only to a bool pointer
...
This makes it easier to identify intentionally setting the property
Test: m nothing
Change-Id: Id89d1e64da3809025f63cafe7557e57a80e0ffee
2023-10-05 17:18:44 -04:00
Christopher Parsons
741272b2b8
Merge changes I5c7f1fc1,I6015581c into main am: 0b5a877f21
am: 9994462ccb
am: 1dd1c7712e
am: b4d89edb56
am: e2926e7c24
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774749
Change-Id: I77fb97ee04206b30f1c343b471a6af2f1cb5b4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 21:13:47 +00:00
Christopher Parsons
ee671ef5af
Merge "Small readability refactor for bp2buildDepsMutator." into main am: d9cc9ec2ea
am: 7c738120f9
am: f14e69b82a
am: dfbbe6d69e
am: 585baad876
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774747
Change-Id: I073afb7714e264ef44ee9b437858ae9fc2e88cc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 21:12:22 +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
e2926e7c24
Merge changes I5c7f1fc1,I6015581c into main am: 0b5a877f21
am: 9994462ccb
am: 1dd1c7712e
am: b4d89edb56
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774749
Change-Id: I623f42345b252e2388b3f047df8f843456985417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 20:44:06 +00:00
Christopher Parsons
585baad876
Merge "Small readability refactor for bp2buildDepsMutator." into main am: d9cc9ec2ea
am: 7c738120f9
am: f14e69b82a
am: dfbbe6d69e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774747
Change-Id: I40ed291fc27b994865af2dd05cd4691c2beb0f2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 20:42:56 +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
Christopher Parsons
b4d89edb56
Merge changes I5c7f1fc1,I6015581c into main am: 0b5a877f21
am: 9994462ccb
am: 1dd1c7712e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774749
Change-Id: I087c8b5f98308e64cdb6c7af612906d6467e3d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 19:55:05 +00:00
Christopher Parsons
dfbbe6d69e
Merge "Small readability refactor for bp2buildDepsMutator." into main am: d9cc9ec2ea
am: 7c738120f9
am: f14e69b82a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774747
Change-Id: If80316623fb0bed077e83bcd1e4bcbb2b5af4e15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 19:54:45 +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
Trevor Radcliffe
b8e9bf3b7f
Merge "Implement bp2build for Sysprop Java" into main am: e3e930d260
am: e66b6c5bc3
am: 00c6285a26
am: c2d60b8a09
am: cdbdd91cb6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769439
Change-Id: I654f072651ef0e17daa6184130d8eb052da9b55f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 18:14:10 +00:00
Elliott Hughes
c41a466958
Merge "riscv64: assume fast unaligned access." into main am: 3fb5c15adf
am: 6014bf35bc
am: 67c1b30ec6
am: f905341ce6
am: 7e417448c8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734373
Change-Id: I5148d822e61290383bcfd51f7ab3fe9f854da5af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 18:13:53 +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
cdbdd91cb6
Merge "Implement bp2build for Sysprop Java" into main am: e3e930d260
am: e66b6c5bc3
am: 00c6285a26
am: c2d60b8a09
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769439
Change-Id: I1d3da8db84948a8d629794a729b1623e626958b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 17:43:00 +00:00
Elliott Hughes
7e417448c8
Merge "riscv64: assume fast unaligned access." into main am: 3fb5c15adf
am: 6014bf35bc
am: 67c1b30ec6
am: f905341ce6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734373
Change-Id: I63f90cb4879b23b7b52d47502740015cb582d632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 17:42:48 +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
Trevor Radcliffe
c2d60b8a09
Merge "Implement bp2build for Sysprop Java" into main am: e3e930d260
am: e66b6c5bc3
am: 00c6285a26
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769439
Change-Id: I3bbc82e2fab6e74f2150625e28ed946fa4e0f3ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 17:11:45 +00:00
Elliott Hughes
f905341ce6
Merge "riscv64: assume fast unaligned access." into main am: 3fb5c15adf
am: 6014bf35bc
am: 67c1b30ec6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734373
Change-Id: I64106c9dbccf5dd26e3f8e55c1d6201c27dabd8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 17:11:35 +00:00
Jingwen Chen
b12eb65fa1
Merge "Delete some api_bp2build dead code." into main am: 26d852a320
am: a2a847ff0f
am: 07438fd01b
am: 9e7f91a0ab
am: e9403e56ce
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774750
Change-Id: I3f55916fab5dbf37df011d65a30e76192b93b25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 17:11:32 +00:00
Alix Espino
235b55988f
Merge "use message in android.AssertStringMatches()" into main am: b7a6720611
am: 5511afdcaa
am: 00b7ab6ad0
am: 2503eb1321
am: c86cf9eae8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773304
Change-Id: Ie017749c2528ca41957fd7d24731a9645a50553d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 17:11:20 +00:00
Kousik Kumar
c371d3ffcb
Merge "Update symlinks in output directory when TOP dir changes" into main am: a902250962
am: 422bad6f88
am: 169678e288
am: 6112e75cb2
am: b834d01b8e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757787
Change-Id: I5a5cd6bff5acd4e7acb876d85b144af321b89756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 17:11:01 +00:00
Jingwen Chen
e9403e56ce
Merge "Delete some api_bp2build dead code." into main am: 26d852a320
am: a2a847ff0f
am: 07438fd01b
am: 9e7f91a0ab
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774750
Change-Id: If05b13fac9e0e5a12da8f24866437e8d92a5613d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 16:25:15 +00:00
Alix Espino
c86cf9eae8
Merge "use message in android.AssertStringMatches()" into main am: b7a6720611
am: 5511afdcaa
am: 00b7ab6ad0
am: 2503eb1321
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773304
Change-Id: I34fc776e211ee9565cff1285608f4bfa2458e9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 16:25:05 +00:00
Kousik Kumar
b834d01b8e
Merge "Update symlinks in output directory when TOP dir changes" into main am: a902250962
am: 422bad6f88
am: 169678e288
am: 6112e75cb2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757787
Change-Id: Ie21d52afacc869faea00e3f8399d02417cd590d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 16:24:35 +00:00