Treehugger Robot
6bc88ae14d
Merge "Allowlist AndroidFrameworkLintChecker" into main
2023-10-06 20:17:25 +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
Christopher Parsons
f7fe400fbc
Merge "Dont write data attrs for cc lib rules" into main
2023-10-06 14:09:07 +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
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
Xin Li
5c7d0cfb7d
Merge "Merge Android 14" into main
2023-10-06 05:38:53 +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
5e0ee313e1
Merge "Disable hiddenapi check for building from prebuilts." into main
2023-10-05 23:51:29 +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
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
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
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
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
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
Alix Espino
b7a6720611
Merge "use message in android.AssertStringMatches()" into main
2023-10-05 13:56:02 +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
Treehugger Robot
ad5c8c1460
Merge "Add packages/modules/Connectivity/staticlibs/netd/libnetdutils" into main am: 65a06d460f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773845
Change-Id: Iabfb5fcfe84f3bfeaaa7e7dd6f83600176935d92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 02:36:10 +00:00
Spandan Das
93cc736f1e
Merge "Create bp2build converter for versioned_ndk_headers" into main am: ee557e4c69
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769119
Change-Id: Ie4240b71b3089ba3fa771ce122fe34c9d6a4f15e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 02:35:54 +00:00
Treehugger Robot
65a06d460f
Merge "Add packages/modules/Connectivity/staticlibs/netd/libnetdutils" into main
2023-10-05 02:22:17 +00:00
Spandan Das
ee557e4c69
Merge "Create bp2build converter for versioned_ndk_headers" into main
2023-10-05 02:00:55 +00:00
Spandan Das
62e66592b3
Add packages/modules/Connectivity/staticlibs/netd/libnetdutils
...
This dir contains a dep of FrameworksNetTests
Test: b build
//packages/modules/Connectivity/staticlibs/netd/libnetdutils/...
--config=android
Bug: 297405814
Change-Id: Ia3b0b99b1230bf6cd43dff6c87309b31b70351c0
2023-10-04 23:35:52 +00:00
Christopher Parsons
a07eedf390
Merge "create, but dont register, bp2build_deps mutator" into main am: 29c559b785
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768645
Change-Id: I45187628f78551bc3b6638a4563434d6dd28bb84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 21:48:17 +00:00
Treehugger Robot
4f20dc378d
Merge "Expand regex for likely aidl filegroups" into main am: e88fe1fb92
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768335
Change-Id: Iebfd7023a546eacccdad6f7972e3ff5d6b9e6943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 21:46:59 +00:00
Christopher Parsons
29c559b785
Merge "create, but dont register, bp2build_deps mutator" into main
2023-10-04 21:38:49 +00:00
Treehugger Robot
e88fe1fb92
Merge "Expand regex for likely aidl filegroups" into main
2023-10-04 21:11:18 +00:00
Alix
141ab6adde
use message in android.AssertStringMatches()
...
function does not currently use the message argument passed to it.
outputting this as part of the error message would be helpful for any
failures.
Change-Id: I5307df1567e79d85f81edd5a9eb3d4a093041535
2023-10-04 20:19:54 +00:00
Liz Kammer
1f309f3ac9
Allowlist AndroidFrameworkLintChecker
...
Test: bp2build.sh
Bug: 299463632
Change-Id: I72def76df4f105a3496c7b2dd1588910e62d562b
2023-10-04 10:37:05 -04:00
Justin Yun
dead374d4d
Merge "Generate product variants by default" into main am: ce12ea8f95
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762829
Change-Id: I31046c62e08a60dbc460f3ac8393782d868d630d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 07:07:47 +00:00
Justin Yun
ce12ea8f95
Merge "Generate product variants by default" into main
2023-10-04 06:29:31 +00:00
Treehugger Robot
31f5c0d738
Merge changes Ib2667798,I9a1fa32b into main am: 4cbd49810c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771005
Change-Id: I80f97088df6104a3e69846ffcf995c24b71bb1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 00:25:38 +00:00
Yu Liu
b57dd3946e
Remove AconfigJavaHostTest from the allowlist.
...
It was added by an accident previously.
Bug: None
Test: CI
Change-Id: I9a1fa32bb2686f336f9735a1e809a8491d38cd4c
2023-10-03 11:22:07 -07:00
Jihoon Kang
3d1cecda28
Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29ec1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769001
Change-Id: Id1645b93c56654857c6d8ae551227c728ac76e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 18:02:14 +00:00
Spandan Das
063030cbb7
Merge "Handle symlinks in isPackageBoundary" into main am: 29af2a470d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769118
Change-Id: Id479359b55f4b75b92817cdeb3a5aaa4333c9c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 18:01:43 +00:00
Yu Liu
2d7db62bcc
Merge "Convert java_aconfig_library to bazel." into main am: 7a90fcfa45
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755429
Change-Id: I298633470fbb8c41442104419b811ac59751d213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 18:01:26 +00:00
Jihoon Kang
a7e5e29ec1
Merge changes from topic "expose_flagged_api_revert" into main
...
* changes:
Revert^2 "Add flagged api hide conditional to droidstubs"
Revert^2 "Add soong config variable Release_expose_flagged_api"
2023-10-03 17:55:16 +00:00
Spandan Das
29af2a470d
Merge "Handle symlinks in isPackageBoundary" into main
2023-10-03 17:51:41 +00:00
Yu Liu
7a90fcfa45
Merge "Convert java_aconfig_library to bazel." into main
2023-10-03 17:29:26 +00:00