Spandan Das
6930284ac2
Merge "Allowlist jni libs of FrameworksNetsTests" into main am: 7836d75592
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776070
Change-Id: Ia84069ebdcca29f55e54ed3cbd6589909a7c68c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 21:08:44 +00:00
Spandan Das
7836d75592
Merge "Allowlist jni libs of FrameworksNetsTests" into main
2023-10-09 19:55:00 +00:00
Elliott Hughes
e4b133c460
Merge "Have the sanitizers trap rather than abort." into main am: 69cf8a3221
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776235
Change-Id: Icd16b72ab0d83343d01cc9e03a6d20cd5ce594b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 16:44:10 +00:00
Treehugger Robot
5c53e28dfe
Merge changes from topic "aapt2_toggle_bazel" into main am: 37fb733466
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776649
Change-Id: I1f98bef38495ec5107579864de25966277d87169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 16:43:36 +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
Elliott Hughes
69cf8a3221
Merge "Have the sanitizers trap rather than abort." into main
2023-10-09 16:08:05 +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
Yi Kong
b0c93d0f17
Merge "Change lto_test to use GlobalThinLTO configuration" into main am: 0b6c4b7c08
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774344
Change-Id: Id045940d839ee64f5d8cec1addf91bc61a1e7f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 11:20:25 +00:00
Yi Kong
0b6c4b7c08
Merge "Change lto_test to use GlobalThinLTO configuration" into main
2023-10-09 10:41:28 +00:00
Kiyoung Kim
22508c4eb2
Merge "Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated" into main am: f161d653cf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777368
Change-Id: I68dcc7fb457744c966b2f173d8e5c62d91eb9624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 06:11:08 +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
Krzysztof Kosiński
fd3d016a70
Clean up obsolete aliases for Truth. am: 5a55439d12
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778191
Change-Id: Icc6cd1419034309e2a85ff44aed3fd32ba59be20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-08 03:40:12 +00:00
Krzysztof Kosiński
5a55439d12
Clean up obsolete aliases for Truth.
...
Bug: 255714762
Test: presubmit
Change-Id: I2d7ef129bc8cad247d805ad392f05cd9d517b67e
2023-10-07 19:59:58 +00:00
Treehugger Robot
4a699d0d6d
Merge "Handle include statements with trailing whitespace" into main am: a32f556ad3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776869
Change-Id: I814d52389a603d03a6747b32f6f4745ef1bb0005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 23:11:29 +00:00
Treehugger Robot
a32f556ad3
Merge "Handle include statements with trailing whitespace" into main
2023-10-06 22:25:04 +00:00
Treehugger Robot
2579fbad62
Merge "Allowlist AndroidFrameworkLintChecker" into main am: 6bc88ae14d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745835
Change-Id: I6652471ae910af49e38d18c52038a1f98e6a550e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:19:00 +00:00
Treehugger Robot
077566faf4
Merge "Update Headers_only to a bool pointer" into main am: 9ea1d061b7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775982
Change-Id: I01cd2d73f055028b09107a06661040c0fd7be845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:18:47 +00:00
Treehugger Robot
6bc88ae14d
Merge "Allowlist AndroidFrameworkLintChecker" into main
2023-10-06 20:17:25 +00:00
Treehugger Robot
9ea1d061b7
Merge "Update Headers_only to a bool pointer" into main
2023-10-06 19:59:17 +00:00
Alyssa Ketpreechasawat
fc3ab39cae
Merge "Revert "Revert "Disable hiddenapi check for building from prebuilts.""" into main am: 2711ce2e1f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775656
Change-Id: Ia8f61e5c775856f54107b273ed5d1b88a976afc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 19:28:15 +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
Dan Albert
9f98477e8f
Merge "Fix error message to still be an error." into main am: dbd4a25cf7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775983
Change-Id: Ife1a7a03e8180f03b1ac6ce848def167171a349a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 19:09:34 +00:00
Cole Faust
b0b2457842
Handle include statements with trailing whitespace
...
Fixes: 303832950
Test: go test
Change-Id: I919556ee43a60f59dbd7c040025f01abb53da2a8
2023-10-06 11:57:29 -07:00
Dan Albert
dbd4a25cf7
Merge "Fix error message to still be an error." into main
2023-10-06 18:55:32 +00:00
Vinh Tran
59ffcbd8de
Merge "Export device arm64 rust flags to Bazel" into main am: 001ec85bcc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773604
Change-Id: Ica62ebb44c14827485d72dd71308e18e3ca1078c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 18:53:08 +00:00
Mark Dacek
5428ba4965
Merge "Revert "Revert "Modify symlink_forest to rerun when soong_build has changed.""" into main am: e0b6329384
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771971
Change-Id: Ifb9b9bfdb867bfc61d424539d76cf161db26f792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 18:51:41 +00:00
Vinh Tran
001ec85bcc
Merge "Export device arm64 rust flags to Bazel" into main
2023-10-06 17:50:15 +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
Mark Dacek
e0b6329384
Merge "Revert "Revert "Modify symlink_forest to rerun when soong_build has changed.""" into main
2023-10-06 17:34:47 +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
Treehugger Robot
633fde4719
Merge "Remove unnecessary arch variant for patch module" into main am: aa46295842
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775981
Change-Id: Ifba6c7e33083b7b1873354470b5bcd208d357702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 16:12:02 +00:00
Treehugger Robot
aa46295842
Merge "Remove unnecessary arch variant for patch module" into main
2023-10-06 15:20:20 +00:00
Christopher Parsons
1140168066
Merge "Dont write data attrs for cc lib rules" into main am: f7fe400fbc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773605
Change-Id: I475de8a01516bf66fbd46c3ccc66ddfe96dc8168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 15:01:39 +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
48828a1837
Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main am: 5cdd22700e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775629
Change-Id: Idffc8e2b98543b4f67aabc0ee066603bb55c2791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 12:10:01 +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
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
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
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
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