Commit Graph

7613 Commits

Author SHA1 Message Date
Alyssa Ketpreechasawat
a54231425c 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
(cherry picked from https://android-review.googlesource.com/q/commit:bb6b813b1de26306e1deb3b3d8842af41f4b5847)
Merged-In: I9fce1e1a9389d58928f1eec50c0eaf016f5f63ac
Change-Id: I9fce1e1a9389d58928f1eec50c0eaf016f5f63ac
2023-10-06 11:03:22 +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
9aa1caae96 Merge "Disable hiddenapi check for building from prebuilts." into main am: 5e0ee313e1 am: 7d2beceffd am: e70e2b0b5d am: 34d4275401 am: 36df3071c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761821

Change-Id: I05cf2f4c807f7038d6be4300ebc544746b7b4d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 02:37:03 +00:00
Zi Wang
ac553c0e55 Merge "Add support for java_library proto plugin in bp2build" into main am: b0f3ff43e5 am: 674022ced0 am: b55cc83aa5 am: 840334b327 am: 69dedc4ceb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768495

Change-Id: Ie25ba2406d474c7678f08e9020aa1408254b9d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 01:18:34 +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
Jason Wu
2893f06347 Denylist libhardware to pass bp2build-incremental am: 4db4f814bb am: f802d7711a am: 9198d768dd am: 0700598790 am: 638472c34a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776028

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

Change-Id: Icf501b82bc0bb293c0f0f94f5dec2ee5f3926374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 23:25:23 +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
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
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
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
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
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
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
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
4d53f1b590 Merge "Add packages/modules/Connectivity/staticlibs/netd/libnetdutils" into main am: 65a06d460f am: ad5c8c1460 am: 30de5c190d am: 2c8ce9b808 am: 87f7fb72be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773845

Change-Id: Id1e276f0cbe125f102bffeeb097691b32f7dc7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 04:44:12 +00:00
Spandan Das
eea8ec412f Merge "Create bp2build converter for versioned_ndk_headers" into main am: ee557e4c69 am: 93cc736f1e am: f213c6dafc am: 09e3710a2d am: 08ab008405
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769119

Change-Id: Ia769d1b41e115e816e60344c295df5676a90b15a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 04:43:54 +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
Christopher Parsons
55138d541d Merge "create, but dont register, bp2build_deps mutator" into main am: 29c559b785 am: a07eedf390 am: 413fa13863 am: 5a9bfd78c1 am: 185d978646
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768645

Change-Id: Ib29d0e40be7ff8b3dd70f98550d600b79af0a905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 00:27:32 +00:00
Treehugger Robot
7fd8981c10 Merge "Expand regex for likely aidl filegroups" into main am: e88fe1fb92 am: 4f20dc378d am: a0e49b2b41 am: 39c0bf5e8d am: 70daba843a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768335

Change-Id: I8d58079318998bd5ba17f4f2464562e2e9e3cd08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 00:25:28 +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