Eric Miao
1957e6eeb9
Merge "Revert "Revert "Enable compact resource entries for aapt linking"""
2023-06-22 16:49:11 +00:00
Vinh Tran
daa767c12a
[automerger skipped] Revert "Revert "Revert "Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp""" am: 10cd5f9e4d
-s ours
...
am skip reason: Merged-In Ib038241eae5ec6af78ac24105c891db55a4d0544 with SHA-1 21bfa5816d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23750764
Change-Id: I475aef61b2c957f2c2108580e784f1b207135ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 15:32:26 +00:00
Vinh Tran
a1548ab4a7
[automerger skipped] Revert "Revert "Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp"" am: 992d5142d2
-s ours
...
am skip reason: Merged-In I5f0e72988cbb6845628d0ec7e82292c0aa1914a7 with SHA-1 e3e7711ac6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23750666
Change-Id: If0ec916772d6359f7d3c7de275a70805b0e13832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 15:32:24 +00:00
Vinh Tran
db85ef4c4d
[automerger skipped] Revert "Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp" am: d2f675d86c
-s ours
...
am skip reason: Merged-In Idf03ebbea764f8c5b3c4fc1623f8f02aa321c8c1 with SHA-1 8106bd0b00
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23750665
Change-Id: I2875598b3eb1ff2f046680abe45221546e5150b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 15:32:20 +00:00
Nikita Ioffe
779a28ca5b
Merge "Update neverallow rules for init_first_stage" am: 4a241d0852
am: 86ce74fee9
am: ba7ff9cd0b
am: 132e6cbb99
am: 64fd638c18
am: b5df8791a1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633190
Change-Id: I322890b3d36eb71ee03395203abeb8ba376abee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 14:54:07 +00:00
Nikita Ioffe
b5df8791a1
Merge "Update neverallow rules for init_first_stage" am: 4a241d0852
am: 86ce74fee9
am: ba7ff9cd0b
am: 132e6cbb99
am: 64fd638c18
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633190
Change-Id: I82756460c7d8570c060d6853defa73e27f2065e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 14:04:15 +00:00
Nikita Ioffe
64fd638c18
Merge "Update neverallow rules for init_first_stage" am: 4a241d0852
am: 86ce74fee9
am: ba7ff9cd0b
am: 132e6cbb99
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633190
Change-Id: I05d90948d0fac2b839a5ebf8351132f1b521c44d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 13:24:54 +00:00
Nikita Ioffe
132e6cbb99
Merge "Update neverallow rules for init_first_stage" am: 4a241d0852
am: 86ce74fee9
am: ba7ff9cd0b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633190
Change-Id: Ia385aae3a8d81258909f01263b0b19b8bbadf579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 12:39:39 +00:00
Nikita Ioffe
ba7ff9cd0b
Merge "Update neverallow rules for init_first_stage" am: 4a241d0852
am: 86ce74fee9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633190
Change-Id: Ic863c5139b2db5059be6a718986b92d17b5e0437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 11:50:13 +00:00
Nikita Ioffe
86ce74fee9
Merge "Update neverallow rules for init_first_stage" am: 4a241d0852
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633190
Change-Id: Ia3de22d26ffb942e237607dc9d33db2528475d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 11:09:54 +00:00
Nikita Ioffe
4a241d0852
Merge "Update neverallow rules for init_first_stage"
2023-06-22 10:11:31 +00:00
Treehugger Robot
1c6f884313
Merge "Remove reference to the deprecated and disabled Typo issue" am: 542f84f4ef
am: 516164c734
am: a9f6b0f326
am: 75aeb94fac
am: 6c2bc3c994
am: 6e16969244
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633189
Change-Id: Ief0caf7a58a67fd0a781670a980664244cc8692f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 06:16:04 +00:00
Treehugger Robot
6e16969244
Merge "Remove reference to the deprecated and disabled Typo issue" am: 542f84f4ef
am: 516164c734
am: a9f6b0f326
am: 75aeb94fac
am: 6c2bc3c994
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633189
Change-Id: I5ec81fd3f4c8a0512e252d9d40cc12404222a211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 05:25:09 +00:00
Treehugger Robot
6c2bc3c994
Merge "Remove reference to the deprecated and disabled Typo issue" am: 542f84f4ef
am: 516164c734
am: a9f6b0f326
am: 75aeb94fac
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633189
Change-Id: I8a1fdce7e9b787ed5251e2592ef9aa8e355430d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 04:44:31 +00:00
Treehugger Robot
75aeb94fac
Merge "Remove reference to the deprecated and disabled Typo issue" am: 542f84f4ef
am: 516164c734
am: a9f6b0f326
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633189
Change-Id: I11700e593e1070a0d8119c5f99601879580a1949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 03:59:10 +00:00
Treehugger Robot
a9f6b0f326
Merge "Remove reference to the deprecated and disabled Typo issue" am: 542f84f4ef
am: 516164c734
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633189
Change-Id: I24ee07a14216ca1d99c451ae55f1bb5c907c3b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 03:08:37 +00:00
Treehugger Robot
516164c734
Merge "Remove reference to the deprecated and disabled Typo issue" am: 542f84f4ef
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633189
Change-Id: I7b7deabba33ad165db2327e6ab7e873b2067dc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 02:29:53 +00:00
Treehugger Robot
af45032943
Merge changes I6ddb47d7,I3df3d304 am: f44ac9efc1
am: 27c7e07c88
am: 5d509743d2
am: 9ae93d07e3
am: 7aa59de283
am: b3b5408907
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629192
Change-Id: If9ecda7af7ee460d3a7c4a5c121c90a293efec1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 01:45:40 +00:00
Mark Dacek
71f5a5002b
Merge "Add bes-id to soong. Also renames the proto field." am: bf4d727ca9
am: 8c62cbe87e
am: a3fbe19233
am: 1641bd9081
am: c6a5a2855d
am: 00486bb8bb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627289
Change-Id: I8b3ed7de32fd0151535b10361d55fbdb1b4c2c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 01:45:11 +00:00
Treehugger Robot
542f84f4ef
Merge "Remove reference to the deprecated and disabled Typo issue"
2023-06-22 01:25:55 +00:00
Treehugger Robot
b3b5408907
Merge changes I6ddb47d7,I3df3d304 am: f44ac9efc1
am: 27c7e07c88
am: 5d509743d2
am: 9ae93d07e3
am: 7aa59de283
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629192
Change-Id: I9919da3d85a91c265c6eca1b3a4ddc7172587785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 01:00:34 +00:00
Mark Dacek
00486bb8bb
Merge "Add bes-id to soong. Also renames the proto field." am: bf4d727ca9
am: 8c62cbe87e
am: a3fbe19233
am: 1641bd9081
am: c6a5a2855d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627289
Change-Id: I15ab16944bffc7161c30f9216d4a0c92fcffcfd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 01:00:08 +00:00
Treehugger Robot
7aa59de283
Merge changes I6ddb47d7,I3df3d304 am: f44ac9efc1
am: 27c7e07c88
am: 5d509743d2
am: 9ae93d07e3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629192
Change-Id: I337f1611f01db565d5024dde521c37283fdbc798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 00:15:22 +00:00
Mark Dacek
c6a5a2855d
Merge "Add bes-id to soong. Also renames the proto field." am: bf4d727ca9
am: 8c62cbe87e
am: a3fbe19233
am: 1641bd9081
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627289
Change-Id: I22578df4d47c719c920962944939732c542ac3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 00:15:07 +00:00
Treehugger Robot
9ae93d07e3
Merge changes I6ddb47d7,I3df3d304 am: f44ac9efc1
am: 27c7e07c88
am: 5d509743d2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629192
Change-Id: I8215be718c9694150cabffe4aadbdf3401f1e175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 23:32:17 +00:00
Treehugger Robot
27c00ee033
Merge "Remove unnecessary variable" am: 98bb2768b9
am: 0acd271057
am: 6248a470c3
am: 6b3ce3a642
am: d1b2d75c59
am: 5cd5e108ba
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2628590
Change-Id: I169d4f5b15509b078967fbaed175f3e91d111b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 23:31:04 +00:00
Mark Dacek
1641bd9081
Merge "Add bes-id to soong. Also renames the proto field." am: bf4d727ca9
am: 8c62cbe87e
am: a3fbe19233
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627289
Change-Id: Ic08e93098bcddb0aad83cb37a9fd501178b25847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 23:29:45 +00:00
Treehugger Robot
5cd5e108ba
Merge "Remove unnecessary variable" am: 98bb2768b9
am: 0acd271057
am: 6248a470c3
am: 6b3ce3a642
am: d1b2d75c59
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2628590
Change-Id: I8029a5c6fbfccd587a3d067eb8cda347831c11f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 22:42:44 +00:00
Treehugger Robot
5d509743d2
Merge changes I6ddb47d7,I3df3d304 am: f44ac9efc1
am: 27c7e07c88
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629192
Change-Id: Iad426f7138f0db400558259f9cafd30fadb4c636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 22:22:32 +00:00
Mark Dacek
a3fbe19233
Merge "Add bes-id to soong. Also renames the proto field." am: bf4d727ca9
am: 8c62cbe87e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627289
Change-Id: I48587bdf04adf8047689113ceae75183130cc811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 22:22:19 +00:00
Treehugger Robot
d1b2d75c59
Merge "Remove unnecessary variable" am: 98bb2768b9
am: 0acd271057
am: 6248a470c3
am: 6b3ce3a642
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2628590
Change-Id: I0926f874f591dc4b3baab22af3d47d92139b1c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:59:44 +00:00
Treehugger Robot
27c7e07c88
Merge changes I6ddb47d7,I3df3d304 am: f44ac9efc1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629192
Change-Id: I20e7c62af860611ee28b6e5c0207717610dfabd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:41:23 +00:00
Mark Dacek
8c62cbe87e
Merge "Add bes-id to soong. Also renames the proto field." am: bf4d727ca9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627289
Change-Id: I2170fbc16648682667c12aad102636b9385c6570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:40:53 +00:00
Treehugger Robot
f44ac9efc1
Merge changes I6ddb47d7,I3df3d304
...
* changes:
[hwasan] Increase BB to explore for reachability
[hwasan] Also pass use-after-scope flag in LTO
2023-06-21 21:14:52 +00:00
Treehugger Robot
6b3ce3a642
Merge "Remove unnecessary variable" am: 98bb2768b9
am: 0acd271057
am: 6248a470c3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2628590
Change-Id: Icd75a4e38441ded198167ead664b6439810fb315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:14:52 +00:00
Mark Dacek
bf4d727ca9
Merge "Add bes-id to soong. Also renames the proto field."
2023-06-21 21:04:07 +00:00
Treehugger Robot
6248a470c3
Merge "Remove unnecessary variable" am: 98bb2768b9
am: 0acd271057
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2628590
Change-Id: I53c668ee5b7e5a9fb4783d08045744c618095ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:31:21 +00:00
Treehugger Robot
0acd271057
Merge "Remove unnecessary variable" am: 98bb2768b9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2628590
Change-Id: Ia9da45204dddb35ccb0cc60b69cfc40d339e928d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 19:02:17 +00:00
Treehugger Robot
98bb2768b9
Merge "Remove unnecessary variable"
2023-06-21 18:13:38 +00:00
Mårten Kongstad
9e9ee66cf4
Merge "Rename aconfig intermediate file (json -> pb)" am: 8f55732317
am: e1a30716f8
am: 09f85b6abc
am: 5b5bee3ed8
am: 85db06658c
am: 377e854936
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2631114
Change-Id: Id2d64338de0f545b6fac4b73d123d361a3579922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 18:13:37 +00:00
Mårten Kongstad
377e854936
Merge "Rename aconfig intermediate file (json -> pb)" am: 8f55732317
am: e1a30716f8
am: 09f85b6abc
am: 5b5bee3ed8
am: 85db06658c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2631114
Change-Id: Ib6d49379baaa5baefb268ea989b2f2ff62bf25c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 17:25:15 +00:00
Mårten Kongstad
85db06658c
Merge "Rename aconfig intermediate file (json -> pb)" am: 8f55732317
am: e1a30716f8
am: 09f85b6abc
am: 5b5bee3ed8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2631114
Change-Id: I2fe18e11702af6c9c0e681b09ce86b7abb7094e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 16:24:04 +00:00
Nikita Ioffe
11a9c2c763
Update neverallow rules for init_first_stage
...
We are introducing Microdroid-specific variant of the init_first_stage,
and need to add init_first_stage_defaults and
init_first_stage.microdroid to the neverallow rule.
Bug: 287206497
Test: build com.android.virt APEX
Change-Id: I88543256ab0479d4676865ebb1d16d9d39f1f455
2023-06-21 16:51:09 +01:00
Mårten Kongstad
5b5bee3ed8
Merge "Rename aconfig intermediate file (json -> pb)" am: 8f55732317
am: e1a30716f8
am: 09f85b6abc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2631114
Change-Id: Ie308988ee8f9a5331e68a2bf9c49d61f3674a1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 15:38:47 +00:00
Lukacs T. Berki
148b4760d4
Handle errors from RunBlueprint(). am: c357c81f48
am: 200e0a8672
am: e3816e619a
am: 112fa9b71f
am: 90d09f96e6
am: 1faf0bd214
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627181
Change-Id: I83aa8bf8170140683375d89accf1b895d0351806
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 15:16:49 +00:00
Mårten Kongstad
09f85b6abc
Merge "Rename aconfig intermediate file (json -> pb)" am: 8f55732317
am: e1a30716f8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2631114
Change-Id: Ib5751b56b1578e36457f5b94ef5b087e6b551e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 14:52:17 +00:00
MarkDacek
396491eee4
Add bes-id to soong. Also renames the proto field.
...
This is for integration with BES for bazel test metrics.
Bug: 287102416
Test: b build libcore:all --invocation_id=`uuidgen`
Test: build/bazel/scripts/analyze_build (to verify it's set)
Change-Id: I541b2d65bfa85718fc916582e0540384ae3810d9
2023-06-21 14:48:17 +00:00
Paul Duffin
c0036491cd
Remove reference to the deprecated and disabled Typo issue
...
Metalava no longer looks for common typos. It relies on the code
analyzers that run on Gerrit to detect them.
Bug: 288072162
Test: m checkapi
Change-Id: I08eca8008af39ebe69442db419ebd3d3378aa0de
2023-06-21 15:42:49 +01:00
Lukacs T. Berki
1faf0bd214
Handle errors from RunBlueprint(). am: c357c81f48
am: 200e0a8672
am: e3816e619a
am: 112fa9b71f
am: 90d09f96e6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627181
Change-Id: I426874a01fad5b979f95d79d3ad6582417226751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 14:31:20 +00:00
Mårten Kongstad
e1a30716f8
Merge "Rename aconfig intermediate file (json -> pb)" am: 8f55732317
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2631114
Change-Id: I33c2a5652d3224acc6150a3e0c4d5d43c9982adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 14:15:38 +00:00