Treehugger Robot
54eedfbcd9
Merge "Exclude REL from preview API levels." into main am: a1e713fe24
am: f6dbb57c92
am: 279ec4b393
am: cb7153bde5
am: 8e194b6613
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776068
Change-Id: I69f54c424860948fb76c80ddff1863bb3c5c0c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:14:22 +00:00
Spandan Das
17c37017ed
Merge "Allowlist jni libs of FrameworksNetsTests" into main am: 7836d75592
am: 6930284ac2
am: 1faddaa40a
am: 137f8c1c4f
am: 0093e92002
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776070
Change-Id: I95cc0804636c9c1433ed206ea2791a47ccaf6ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:14:02 +00:00
Treehugger Robot
a1e713fe24
Merge "Exclude REL from preview API levels." into main
2023-10-09 20:34:06 +00:00
Treehugger Robot
d417efa7f0
Merge changes from topic "aapt2_toggle_bazel" into main am: 37fb733466
am: 5c53e28dfe
am: dd719ded06
am: 83c4bc3857
am: 7e97b1c519
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776649
Change-Id: If66425134d44ccee91766fc7fc69d7dc79ad02b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 20:02:17 +00:00
Romain Jobredeaux
83d934ba10
Allowlist kotlinx_coroutines_android am: f2e3c111ec
am: 5c3cda4b18
am: a6cb845fa4
am: 9a16f22732
am: 3079d8133f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776650
Change-Id: I5c86a9342573e799cd6361250aa7cf33611cf3e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 20:02:09 +00:00
Spandan Das
7836d75592
Merge "Allowlist jni libs of FrameworksNetsTests" into main
2023-10-09 19:55:00 +00:00
Romain Jobredeaux
5c3cda4b18
Allowlist kotlinx_coroutines_android am: f2e3c111ec
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776650
Change-Id: I531dff0d5535c6ac0d4aabf71686e26080b3f2d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 16:43:29 +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
0c6935113b
Merge "Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated" into main am: f161d653cf
am: 22508c4eb2
am: 0ccd34b149
am: c90533a119
am: c2ef241726
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777368
Change-Id: Ide2bb5ae143d335a7012276713f7e35982e1a82c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 08:45:33 +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
0ca2e0f55a
Merge "Allowlist AndroidFrameworkLintChecker" into main am: 6bc88ae14d
am: 2579fbad62
am: 8cd59aee93
am: 6ec3b31d6c
am: 23bbcdffe9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745835
Change-Id: Idd5aafd4b27fe3c089b06c7851c02c73e835048b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-07 00:58:59 +00:00
Alyssa Ketpreechasawat
98dcc42dca
Merge "Revert "Revert "Disable hiddenapi check for building from prebuilts.""" into main am: 2711ce2e1f
am: fc3ab39cae
am: 7209384e9a
am: c5e1ac2ea6
am: 0d617b6248
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775656
Change-Id: I314b67d600ed59f569a57f3e4be3c7c64a047d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-07 00:55:29 +00:00
Christopher Parsons
fe3d729f74
Merge "Dont write data attrs for cc lib rules" into main am: f7fe400fbc
am: 1140168066
am: 100e5a256b
am: c3757c0c02
am: 9ad29be603
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773605
Change-Id: I3a3c910807ae55b1027b5a3e88fdf650f7e25fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-07 00:51:31 +00:00
Alyssa Ketpreechasawat
1173751119
Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main am: 5cdd22700e
am: 48828a1837
am: 3e49b3be0a
am: 64528895c0
am: 4afb4344c9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775629
Change-Id: I43cfb3178440e53a34aa044412fd40054b65012d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-07 00:47:33 +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
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
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