Commit Graph

6787 Commits

Author SHA1 Message Date
Christopher Parsons
c27e8f1427 Merge "Turn on bp2build_deps by default" into main 2023-10-11 15:18:18 +00:00
Jason Wu
5a2a94ebf0 Merge "Update sh_test conversion to handle data_bins and test_configs properly" into main 2023-10-11 01:11:15 +00:00
Jason Wu
25c69eec45 Update sh_test conversion to handle data_bins and test_configs properly
sh_test.data_bins are used to mark special executable dependencies which should be installed alongside the test entry point's cwd as siblings. This change makes it such that the Tradefed rule places them at the expected location. In addition, this change also incorporates the `tradefed.TestConfigAttributes` to handle the test_configs conversions.

Test: bp2build.sh
Bug: 283486885
Change-Id: Ifeb049c13ae208c785dbdc858f589be8f21109d1
2023-10-10 14:03:19 -04:00
Chris Parsons
d43be7c704 Turn on bp2build_deps by default
This prevents bp2buld conversion of modules which have transitive deps
that are not converted.

This does not change most allowlist semantics -- that change is still to
come. As a result, this effectively removes conversion of a few modules
which were previously converted under old semantics, however, these
modules are not currently used in any meaningful bazel builds, and will
be fixed at a later time.

Test: bp2build.sh
Test: m nothing
Test: manually spotchecked allowlisted modules in metrics to ensure the
diffs were minor
Test: manually verified bp2build performance regresses by about 0.4s

Change-Id: Id5c44fa5394917b28a3e707a81555b9e467d6621
2023-10-10 03:20:16 +00:00
Zi Wang
74c9a7758b Address comments from aosp/2777928
Test: CI
Change-Id: I0d8ee145d797e44338b7eca91fda4177464d7bdb
2023-10-09 17:56:06 -07:00
Zi Wang
734266b633 Use correct module name for java_import in shouldConvertWithBp2build verification
This change makes sure that prebuilt module has correct module name
prefix("prebuilt_") inside method shouldConvertWithBp2build, to avoid
the bp2build conflict issue when a normal module and a prebuilt module
with the same name are both allowlisted.

Test: CI, added unit tests and the steps to reproduce in b/303376793

Bug: 303376793
Bug: 303868211
Change-Id: I4f1126182ec1f52ae6a08046a77204939230edef
2023-10-09 16:51:35 -07:00
Spandan Das
008f2e55c7 Merge "Allowlist jni libs of FrameworksNetsTests" into main 2023-10-09 23:38:59 +00:00
Treehugger Robot
a1e713fe24 Merge "Exclude REL from preview API levels." into main 2023-10-09 20:34:06 +00:00
Spandan Das
7836d75592 Merge "Allowlist jni libs of FrameworksNetsTests" into main 2023-10-09 19:55:00 +00:00
Treehugger Robot
37fb733466 Merge changes from topic "aapt2_toggle_bazel" into main
* changes:
  Allowlist prebuilt version aapt2
  Allowlist kotlinx_coroutines_android
2023-10-09 16:02:37 +00:00
Kiyoung Kim
f161d653cf Merge "Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated" into main 2023-10-09 05:31:12 +00:00
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
Romain Jobredeaux
69e2d83e8d Allowlist prebuilt version aapt2
Bug: 303786272
Test: CI + Manual build
Change-Id: I0a748430e4f2c4d77c6564562c3a85b0dc4368e4
2023-10-06 13:46:42 -04:00
Romain Jobredeaux
f2e3c111ec Allowlist kotlinx_coroutines_android
Change-Id: Ib097d43e0abb6a94cdb4e0ff13d6ac3e0c13da9f
2023-10-06 13:46:15 -04:00
Spandan Das
ef3fbfeef2 Allowlist jni libs of FrameworksNetsTests
This includes
- libandroid_net_connectivity_com_android_net_module_util_jni
- libservice-connectivity
- netd_aidl_interface-V5-cpp

Bug: 297405814
Test: b build $(bmod libandroid_net_connectivity_com_android_net_module_util_jni) --config=android
Test: b build $(bmod libservice-connectivity) --config=android
Test: b build //packages/modules/Connectivity/staticlibs/netd:netd_aidl_interface-V5-cpp --config=android

Change-Id: I519bfba93cc0b8895b21a4287abd85299fea9afc
2023-10-06 17:18:48 +00:00
Spandan Das
046c8b4f19 Allowlist jni libs of FrameworksNetsTests
This dir contains the following jni libs
- libnetworkstatsfactorytestjni
- libandroid_net_frameworktests_util_jni

Bug: 297405814
Test: b build $(bmod libnetworkstatsfactorytestjni) --config=android
Test: b build $(bmod libandroid_net_frameworktests_util_jni) --config=android

Change-Id: I3905396cab8df5ebbbf12eafcd9f96cde8305697
2023-10-06 17:18:45 +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
Kiyoung Kim
03b6cba1f2 Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated
TARGET_VNDK_USE_CORE_VARIANT enables vendor to use some of the VNDK
libraries with core variant installed in /system/lib. However, this does
not make sense when VNDK is deprecated. This change is to ignore
TARGET_VNDK_USE_CORE_VARIANT when the VNDK is deprecated.

Bug: 303754049
Test: aosp_cf_x86_go_phone boot succeeded
Change-Id: Ie9fa75e0fa452e48924d51d64201690ffb271f33
2023-10-06 14:12:43 +09: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
Dan Albert
f93ea13e91 Exclude REL from preview API levels.
Bug: http://b/156513478#comment43
Test: m ndk # barbet-next-userdebug in goog/main
Change-Id: I0ff1e45d61d605493c784a118232b839324e066e
2023-10-05 21:31:58 +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