Commit Graph

88516 Commits

Author SHA1 Message Date
Treehugger Robot
6f126db966 Merge "Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: c4ebac631b am: 2a87d85bf5 am: e0ec64b4e1
Original change: https://android-review.googlesource.com/c/platform/build/+/2636336

Change-Id: I94b0c520cc5d2971f23bb21afe95e2c077433298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 14:14:46 +00:00
Treehugger Robot
571cd07796 Merge "aconfig: add dump --format=textproto" 2023-06-26 13:59:41 +00:00
Lukács T. Berki
06b0646b95 Merge "Change initialization message." am: 9235b7a2b4 am: b2ff7bf25e
Original change: https://android-review.googlesource.com/c/platform/build/+/2635674

Change-Id: Ica47124275ea284a586d0b02b013c7f7d27ce6b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 13:26:13 +00:00
Treehugger Robot
e0ec64b4e1 Merge "Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: c4ebac631b am: 2a87d85bf5
Original change: https://android-review.googlesource.com/c/platform/build/+/2636336

Change-Id: I9a29b2d6c0e4a64f84be7bf75345eed85a26a732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 13:25:49 +00:00
Lukács T. Berki
b2ff7bf25e Merge "Change initialization message." am: 9235b7a2b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2635674

Change-Id: I8ba1178f3ddf30e304c0c5c7907cede559e95124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 12:45:42 +00:00
Treehugger Robot
2a87d85bf5 Merge "Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: c4ebac631b
Original change: https://android-review.googlesource.com/c/platform/build/+/2636336

Change-Id: I95bf6c190d0a8373913260c738cbe1af6bd64aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 12:45:10 +00:00
Lukács T. Berki
9235b7a2b4 Merge "Change initialization message." 2023-06-26 12:08:18 +00:00
Treehugger Robot
c4ebac631b Merge "Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" 2023-06-26 12:04:42 +00:00
Mårten Kongstad
3228b29cac aconfig: add dump --format=textproto
Teach `aconfig dump` to print its as text protobuf.

Bug: 288713733
Test: atest aconfig.test aconfig.test.java
Change-Id: Id31ce53226162a563fbe2d4841a8f6cf96c22436
2023-06-26 10:17:42 +02:00
Mårten Kongstad
3f0151dcc7 Merge "aconfig: add proto bug field" am: 37cb74b3e4 am: 4a294a65b4 am: 4c30c59324
Original change: https://android-review.googlesource.com/c/platform/build/+/2634549

Change-Id: Icc1379d0e62cd84f835c0088da8b63502cb1aba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 08:09:16 +00:00
Mitch Phillips
c77b68f30d Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." am: 61ce7afb21 am: 49211348ea am: c6076a3bb6
Original change: https://android-review.googlesource.com/c/platform/build/+/2625936

Change-Id: I3ab9dd553e2d83c5cffbf0744f9c298b1ce766db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 08:08:55 +00:00
Mårten Kongstad
4c30c59324 Merge "aconfig: add proto bug field" am: 37cb74b3e4 am: 4a294a65b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2634549

Change-Id: Ic6b8eb3f55f522b7cc401e26c554c69e353c3854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 07:19:18 +00:00
Mitch Phillips
c6076a3bb6 Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." am: 61ce7afb21 am: 49211348ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2625936

Change-Id: I205582b4e6914f5363b8ef5ef9b588e948794637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 07:18:58 +00:00
Lukacs T. Berki
3a958ff8a0 Change initialization message.
There are now two newer build systems.

Test: Presubmit.
Change-Id: I9e62e9223ddc757d71f1b404e1cc0a0634b740d4
2023-06-26 07:04:42 +00:00
Mårten Kongstad
4a294a65b4 Merge "aconfig: add proto bug field" am: 37cb74b3e4
Original change: https://android-review.googlesource.com/c/platform/build/+/2634549

Change-Id: I0c846a9c290ab59f1dc3a46e9d519f9a318c5793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 06:38:33 +00:00
Mitch Phillips
49211348ea Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." am: 61ce7afb21
Original change: https://android-review.googlesource.com/c/platform/build/+/2625936

Change-Id: I02a301fb3f60fd35bf63e3d7c7f0eb0451e5a876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 06:38:11 +00:00
Mårten Kongstad
37cb74b3e4 Merge "aconfig: add proto bug field" 2023-06-26 06:27:48 +00:00
Mitch Phillips
61ce7afb21 Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." 2023-06-26 05:50:11 +00:00
Pranav Gupta
ed6219e6db DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21 am: a047ea2b58 am: 459bc8ccf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: I98dcb1437d37838720b6b25864aa97bea7227ba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 17:19:20 +00:00
Pranav Gupta
5379e51548 DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21 am: a047ea2b58 am: 9506648892
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: I5aa500cd8885075c6a83f5d6011f6c62a8f8241a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 17:13:23 +00:00
Pranav Gupta
459bc8ccf2 DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21 am: a047ea2b58
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: I61335352118772d2abcf5a3e01597a16a9552792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 16:32:40 +00:00
Pranav Gupta
9506648892 DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21 am: a047ea2b58
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: Iea8919344cf58868cc3d0c6e5270b2c041fec284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 16:28:14 +00:00
Pranav Gupta
e9a48a29c2 DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21 am: db3e60fecc am: 4e7aeed8ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: I771e41884c5e864cc4467366f34fe0335e228f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 02:54:55 +00:00
Gabriel Biren
26efa8c17e Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" am: 6656e58856 am: dbe8cb7530 am: 3f30113322
Original change: https://android-review.googlesource.com/c/platform/build/+/2636149

Change-Id: I5e6067027ffa457ac1fae24b2e884854575a89bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 18:30:59 +00:00
Gabriel Biren
3f30113322 Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" am: 6656e58856 am: dbe8cb7530
Original change: https://android-review.googlesource.com/c/platform/build/+/2636149

Change-Id: Ie28a6a9acf185c0dbe23612a66a6834364409664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 17:40:22 +00:00
Gabriel Biren
dbe8cb7530 Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" am: 6656e58856
Original change: https://android-review.googlesource.com/c/platform/build/+/2636149

Change-Id: Ib0bd147c4123216fad664af54ceec95d05edf89d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 17:00:31 +00:00
Gabriel Biren
6656e58856 Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" 2023-06-23 16:19:13 +00:00
Jooyung Han
0d7864a723 Merge "Do not pass TARGET_FLATTEN_APEX to soong" am: bd7ef6bc94 am: 3e75b8234f am: 44abd26c56
Original change: https://android-review.googlesource.com/c/platform/build/+/2632449

Change-Id: Ic74df87c2c3c6a636a464416f824fe74c4674477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 07:09:09 +00:00
Inseob Kim
77e317d852 Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 288517951
Test: m selinux_policy
Change-Id: I4d5b0bffbc7dd4ec3852da1674937e349e2ab322
2023-06-23 15:51:26 +09:00
Pranav Gupta
4e7aeed8ff DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21 am: db3e60fecc
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: Ibd5c60fbf74b1b258e0ec3929d9ff909f908b247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 06:49:21 +00:00
Pranav Gupta
a047ea2b58 DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: I2547740c029e655ac8d581fc4de6bb429d6261fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 06:04:51 +00:00
Pranav Gupta
db3e60fecc DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: I1111def4e05999ecb48856855b7ee519a1ed6ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 06:00:07 +00:00
Jooyung Han
44abd26c56 Merge "Do not pass TARGET_FLATTEN_APEX to soong" am: bd7ef6bc94 am: 3e75b8234f
Original change: https://android-review.googlesource.com/c/platform/build/+/2632449

Change-Id: I0b0f5d144a83cd8f2e54e8077203278f3bddd4de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 05:36:25 +00:00
Jooyung Han
3e75b8234f Merge "Do not pass TARGET_FLATTEN_APEX to soong" am: bd7ef6bc94
Original change: https://android-review.googlesource.com/c/platform/build/+/2632449

Change-Id: I553990cf398e5ad6c13dfacca401e6132ec5db4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 04:59:55 +00:00
Pranav Gupta
20545fcf21 DO NOT MERGE: Enable mainline prebuilts for device targets
Ignore-AOSP-First: Android Mainline prebuilts are not used for AOSP targets
Bug: 286892268
Change-Id: I6f89f47a8e545e563b184cdc9395eddd49950228
Test: pre-submit
2023-06-23 04:59:26 +00:00
Jooyung Han
bd7ef6bc94 Merge "Do not pass TARGET_FLATTEN_APEX to soong" 2023-06-23 04:09:48 +00:00
Wei Li
5d44de9cb6 Merge "Revert "Support SBOM generation of m build unbundled APEXs."" am: d952b49430 am: 4aea05c316 am: 399ae160a5 am: 872ac0af75 am: c70a4937cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2636172

Change-Id: I1f16a3da9c24053e4bcb67b7c4c89342c249e48e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 02:40:10 +00:00
Wei Li
c70a4937cd Merge "Revert "Support SBOM generation of m build unbundled APEXs."" am: d952b49430 am: 4aea05c316 am: 399ae160a5 am: 872ac0af75
Original change: https://android-review.googlesource.com/c/platform/build/+/2636172

Change-Id: I63ffe3ffe0a36bfbfc268d8a75df376b3608c710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 01:40:12 +00:00
Wei Li
872ac0af75 Merge "Revert "Support SBOM generation of m build unbundled APEXs."" am: d952b49430 am: 4aea05c316 am: 399ae160a5
Original change: https://android-review.googlesource.com/c/platform/build/+/2636172

Change-Id: Iab94c5080037ae44b1464e8206050ab0d0864617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:52:30 +00:00
Wei Li
399ae160a5 Merge "Revert "Support SBOM generation of m build unbundled APEXs."" am: d952b49430 am: 4aea05c316
Original change: https://android-review.googlesource.com/c/platform/build/+/2636172

Change-Id: Ic5d552e8cd0ca3ed674d2eb20408622e05bc26e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:07:37 +00:00
Wei Li
4aea05c316 Merge "Revert "Support SBOM generation of m build unbundled APEXs."" am: d952b49430
Original change: https://android-review.googlesource.com/c/platform/build/+/2636172

Change-Id: I170b70bb4c94bd7ce93d17c68f938886aa29df2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 23:25:26 +00:00
Wei Li
d952b49430 Merge "Revert "Support SBOM generation of m build unbundled APEXs."" 2023-06-22 22:35:48 +00:00
Wei Li
bab162156e Revert "Support SBOM generation of m build unbundled APEXs."
This reverts commit 7c4f064a2b.

Reason for revert: this caused some CI breakages on git_master, mainline_modules_xxxx

Change-Id: I95354db66991f6c257164d6f808b9fe4350673c1
2023-06-22 22:21:00 +00:00
Kelvin Zhang
91598c7579 [automerger skipped] Handle symlinks when extracting zipfiles am: b7dc0481c6 am: 4582309b58 -s ours
am skip reason: Merged-In Ia7d6ac8ffb03807680a36ff648aa11afafb7f481 with SHA-1 b7dc0481c6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23774578

Change-Id: Ic46c3ca024fa7a4b5e35f43b765936817002b9fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 21:56:20 +00:00
Daniel Zheng
0d1b969d1f Adding recovery image
adding recovery image to fastboot-info

Test: m fastboot_info
Change-Id: I65cfb4e3953d94455638002a3ccf442c5ad87a9e
2023-06-22 14:52:59 -07:00
Kelvin Zhang
3b1724f83b [automerger skipped] Handle symlinks when extracting zipfiles am: b7dc0481c6 -s ours am: 959eeb3f6b -s ours
am skip reason: Merged-In Ia7d6ac8ffb03807680a36ff648aa11afafb7f481 with SHA-1 e473ce9e80 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23774578

Change-Id: I5afd782006387ec8a39ee4209e2679e8f1a8d6bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 21:52:09 +00:00
Kelvin Zhang
4582309b58 Handle symlinks when extracting zipfiles am: b7dc0481c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23774578

Change-Id: I66761aecf9116fd9170eac075647c6741f273e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 21:06:30 +00:00
Kelvin Zhang
959eeb3f6b [automerger skipped] Handle symlinks when extracting zipfiles am: b7dc0481c6 -s ours
am skip reason: Merged-In Ia7d6ac8ffb03807680a36ff648aa11afafb7f481 with SHA-1 e473ce9e80 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23774578

Change-Id: I0baa845dfda00d9efba1c31ef203bde80afb4be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 21:04:25 +00:00
Gabriel Biren
720deccc0b Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"
This reverts commit fdcf16f55c.

Reason for revert: Variable belongs internally

Change-Id: I3af8968f36f68bed34f40c921608582b1798ca65
2023-06-22 17:32:03 +00:00
Joe Onorato
2855a8295d Merge "Rename device_config --> aconfig and definitions --> declarations" am: 9ccb457588 am: 958b906ed8 am: a83f50d161 am: 4a80353011 am: 63a1fdcbab
Original change: https://android-review.googlesource.com/c/platform/build/+/2633872

Change-Id: I2c7a992ddeb0556e0eaca610bf1eb4a63659515e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 17:27:31 +00:00