Commit graph

75337 commits

Author SHA1 Message Date
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
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
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
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
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
Jingwen Chen
9e7f91a0ab Merge "Delete some api_bp2build dead code." into main am: 26d852a320 am: a2a847ff0f am: 07438fd01b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774750

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

Change-Id: Idd810158809866869f9b5e13f488efb3855e8321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 15:52:03 +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
Kousik Kumar
6112e75cb2 Merge "Update symlinks in output directory when TOP dir changes" into main am: a902250962 am: 422bad6f88 am: 169678e288
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757787

Change-Id: I1818842c30eb80bc8a8d721334a0cf43452698e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 15:51:35 +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
Kousik Kumar
422bad6f88 Merge "Update symlinks in output directory when TOP dir changes" into main am: a902250962
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757787

Change-Id: I03f17df8a34f58a93d96141fbab5b521b2ff303b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 14:19:08 +00:00
Alix Espino
b7a6720611 Merge "use message in android.AssertStringMatches()" into main 2023-10-05 13:56:02 +00:00
Kousik Kumar
a902250962 Merge "Update symlinks in output directory when TOP dir changes" into main 2023-10-05 13:29:20 +00:00
Jingwen Chen
863e33471a Delete some api_bp2build dead code.
Follow up of https://android-review.googlesource.com/2630914

Bug: 284029211
Test: presubmits
Change-Id: Idc0ff2f20e54b81cfdf61472a72e9cb027f60554
2023-10-05 10:23:58 +00:00
Jingwen Chen
8c49fc7cac Fix comment for Bp2buildDepsMutator config.
Test: presubmit
Change-Id: I5c7f1fc188eb37d3a457f9d4e2365d89ce2190e9
2023-10-05 10:07:52 +00:00
Jingwen Chen
3e582b8175 Use parameter name hint for BazelLabelModuleDepsWithFn's markAsDeps.
Test: presubmits
Change-Id: I6015581c27ad8b9b5b81d0ed01ba219699b9630b
2023-10-05 10:03:06 +00:00
Jingwen Chen
464e6a083f Small readability refactor for bp2buildDepsMutator.
Test: presubmits
Change-Id: I59bc943cf8c3419bf16a7053d967d464f9f40f21
2023-10-05 09:59:43 +00:00
Kiyoung Kim
08468f7353 Merge "Do not allow a module exists both in provideLibs and requireLibs" into main am: f2fd12d97c am: 25ee09b5b6 am: 9b31abbd26 am: 75e9b19848
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762828

Change-Id: I5d4730051a8b948d07037b33a731098775b199cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 05:59:58 +00:00
Kiyoung Kim
75e9b19848 Merge "Do not allow a module exists both in provideLibs and requireLibs" into main am: f2fd12d97c am: 25ee09b5b6 am: 9b31abbd26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762828

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