Commit graph

75337 commits

Author SHA1 Message Date
Xin Li
06a1777ad6 [automerger skipped] Merge Android 14 am: 5a38034916 -s ours am: 91b0c64df5 -s ours am: 1044e8491a -s ours am: 20a865a2cf -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775985

Change-Id: Ifffce6c8eee893997149303541923ac244249d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:12 +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
1d2881c1fb Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206 am: 40ed4395ab am: 33eb8c5a6d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777308

Change-Id: I62ec9b00bc766764160013c0ee70928650126aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 10:26:44 +00:00
Xin Li
6a3d1e3428 [automerger skipped] Merge "Merge Android 14" into main am: 5c7d0cfb7d -s ours am: 0a5d8bac49 -s ours am: 64e0299ecf -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775985

Change-Id: I248e3a26b2bef961ac6d716a7eb35c9f5575b3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:55:05 +00:00
Xin Li
20a865a2cf [automerger skipped] Merge Android 14 am: 5a38034916 -s ours am: 91b0c64df5 -s ours am: 1044e8491a -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775985

Change-Id: I0e765b7cc5d185f9cbe7e783c331a2084e230036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:21 +00:00
Alyssa Ketpreechasawat
33eb8c5a6d Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206 am: 40ed4395ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777308

Change-Id: Ia877e9178f877f696868222bba1e5f985a8b92d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:36:10 +00:00
Xin Li
64e0299ecf [automerger skipped] Merge "Merge Android 14" into main am: 5c7d0cfb7d -s ours am: 0a5d8bac49 -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775985

Change-Id: I411c4295715d01ded52649057e9fdd903bb1a4b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:03:13 +00:00
Xin Li
1044e8491a [automerger skipped] Merge Android 14 am: 5a38034916 -s ours am: 91b0c64df5 -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775985

Change-Id: Id284b6151b56a2f6207dbd3c77e4c490f5cea3c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:43 +00:00
Treehugger Robot
9f4a6bef88 Merge "Denylist genrules that fail to build with sandboxing" into main am: c6f50151d0 am: babb8c089e am: 84479cb9d5 am: 2803be85fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776072

Change-Id: I240a5806ec446d79afbc1ee7042c3d8ebbe21475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:45:59 +00:00
Alyssa Ketpreechasawat
40ed4395ab Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777308

Change-Id: I5e5dbbfe5a744520ac519799540174b6f81f7f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:16:37 +00:00
Xin Li
0a5d8bac49 [automerger skipped] Merge "Merge Android 14" into main am: 5c7d0cfb7d -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775985

Change-Id: I4879ee8e881a980a8f862835ce9a8703b8178545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:56:26 +00:00
Xin Li
91b0c64df5 [automerger skipped] Merge Android 14 am: 5a38034916 -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775985

Change-Id: Ida05ed512d0e3d7de12bfd4254a23d1c76a3f8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:40 +00:00
Treehugger Robot
2803be85fd Merge "Denylist genrules that fail to build with sandboxing" into main am: c6f50151d0 am: babb8c089e am: 84479cb9d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776072

Change-Id: If7690f1fe94fea4261794be2660f172dd1744ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:19:27 +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
Treehugger Robot
84479cb9d5 Merge "Denylist genrules that fail to build with sandboxing" into main am: c6f50151d0 am: babb8c089e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776072

Change-Id: Id3722648d9e10ac6c3a725099e0cae046eb54704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 06:44:09 +00:00
Alyssa Ketpreechasawat
affbb8d206 Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main 2023-10-06 06:18:18 +00:00
Treehugger Robot
babb8c089e Merge "Denylist genrules that fail to build with sandboxing" into main am: c6f50151d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776072

Change-Id: Ifae6e822b299819e5e21ef93d9ee790c2e96d3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 05:52:57 +00:00
Xin Li
5c7d0cfb7d Merge "Merge Android 14" into main 2023-10-06 05:38:53 +00:00
Treehugger Robot
c6f50151d0 Merge "Denylist genrules that fail to build with sandboxing" into main 2023-10-06 05:27:32 +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
Cole Faust
8a25345b7d Denylist genrules that fail to build with sandboxing
Bug: 290816499
Test: run genrule_sandbox_test.py with a local change to check all genrules in the tree
Change-Id: Id18b801c2306dd59b5b593b004b513b578ce3705
2023-10-06 05:12:07 +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
36df3071c9 Merge "Disable hiddenapi check for building from prebuilts." into main am: 5e0ee313e1 am: 7d2beceffd am: e70e2b0b5d am: 34d4275401
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761821

Change-Id: I32ba7f4ccc616385714ed7044604971164806bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 02:06:55 +00:00
Alyssa Ketpreechasawat
34d4275401 Merge "Disable hiddenapi check for building from prebuilts." into main am: 5e0ee313e1 am: 7d2beceffd am: e70e2b0b5d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761821

Change-Id: Iebc4b9d558816ecb3be37fdab2fd8ffd42e57919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 01:36:02 +00:00
Alyssa Ketpreechasawat
e70e2b0b5d Merge "Disable hiddenapi check for building from prebuilts." into main am: 5e0ee313e1 am: 7d2beceffd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761821

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

Change-Id: I400e86a85dfdcca20fefa7b34be381f963397ec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 00:47:21 +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
Zi Wang
840334b327 Merge "Add support for java_library proto plugin in bp2build" into main am: b0f3ff43e5 am: 674022ced0 am: b55cc83aa5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768495

Change-Id: I2dc648611af64e5ab42d2bebf8337c549551aca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 00:14:58 +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
b55cc83aa5 Merge "Add support for java_library proto plugin in bp2build" into main am: b0f3ff43e5 am: 674022ced0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768495

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

Change-Id: Id1004faf2299a15a3005799a1210113e44ec987b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 22:36:57 +00:00
Christopher Parsons
066f9c89db Merge "Test changes to prepare for allowlist v2" into main am: c774c92f57 am: c80520b885 am: 8a4f82bba6 am: fbb03a2b57
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775587

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

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

Change-Id: Id9d9fefb88a09d2db2332644019680f05bfeb780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 22:07:48 +00: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
Christopher Parsons
fbb03a2b57 Merge "Test changes to prepare for allowlist v2" into main am: c774c92f57 am: c80520b885 am: 8a4f82bba6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775587

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

Change-Id: I3c4165ee39fcf4aa7c2f5e9648b71d847eb9226c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 22:04:06 +00:00
Elliott Hughes
3bba0e4bfe Have the sanitizers trap rather than abort.
abort() seems friendlier, but in practice it puts a couple of irrelevant
libc.so frames on the top of the stack trace and clobbers all the
registers that might have helped remotely debug a sanitizer failure.
Let's switch to trapping directly in the sanitized code instead.

Bug: http://b/298741930
Test: treehugger
Change-Id: I6c971920c8506f97133749aaddd73b8cea6a12bc
2023-10-05 14:51:28 -07:00
Dan Albert
5b2fd587c0 Fix error message to still be an error.
Bug: http://b/156513478#comment43
Test: m ndk, actually checked that it actually failed
Change-Id: I1951ddfee3bef7d06ab4561e445d75358e5a4abf
2023-10-05 21:45:41 +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
9198d768dd Denylist libhardware to pass bp2build-incremental am: 4db4f814bb am: f802d7711a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776028

Change-Id: I4795fa693f1b0e6516aa3c0961a7b7bc6a6b5671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 21:30:16 +00:00
Christopher Parsons
8a4f82bba6 Merge "Test changes to prepare for allowlist v2" into main am: c774c92f57 am: c80520b885
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775587

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

Change-Id: I3803c3b3426f4bec39a415e112b0843070c48265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 21:29:48 +00:00
Liz Kammer
6077263084 Update Headers_only to a bool pointer
This makes it easier to identify intentionally setting the property

Test: m nothing
Change-Id: Id89d1e64da3809025f63cafe7557e57a80e0ffee
2023-10-05 17:18:44 -04:00
Liz Kammer
0a470a3c14 Remove unnecessary arch variant for patch module
Test: CI
Change-Id: Ibc058407ffb09afa38d9248f4391019e8786602b
2023-10-05 17:02:00 -04: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
c80520b885 Merge "Test changes to prepare for allowlist v2" into main am: c774c92f57
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775587

Change-Id: I1a7f588d1a728996c2b4bd3c6eba671f317dbdb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 20:58:50 +00:00