Commit Graph

89050 Commits

Author SHA1 Message Date
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
Mitch Phillips
8520f4b19e [MTE] [gnu make] Add memtag_globals as a sanitizer target.
GNU make bits for https://android-review.git.corp.google.com/c/platform/build/soong/+/2625692.

Bug: N/A
Test: Build {libc, libm, libc++, libm, and libnetd} in internal master
with these patches and an experimental compiler with the lld support.
Also, `SANITIZE_TARGET=memtag_globals m` here with in-tree compiler
without lld support.

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

Change-Id: Iae2bd3a9eae03ebb6abf84bd3e6fe1e2034a6011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 16:22:23 +00:00
Joe Onorato
4a80353011 Merge "Rename device_config --> aconfig and definitions --> declarations" am: 9ccb457588 am: 958b906ed8 am: a83f50d161
Original change: https://android-review.googlesource.com/c/platform/build/+/2633872

Change-Id: If9360ebd0acebe85f42f89a268c316d51c765708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 15:36:36 +00:00
Mårten Kongstad
1b8636bd7d aconfig: add proto bug field
Add a `bug` field on the flag_declaration and parsed_flag proto
messages. This field is optional in the sense that it can occur zero or
more times, and aconfig will simply pass any value through.

Bug fields are included in the aconfig dump format, which can be
processed by other tools.

Also unify how protos.rs checks that fields marked 'optional' in the
proto file, but in practice are 'required', are actually set.

Test: atest aconfig.test aconfig.test.java
Bug: 288261336
Change-Id: I93de0005674822c6ff4d699bdc2c6509763a7f7f
2023-06-22 16:50:33 +02:00
Joe Onorato
a83f50d161 Merge "Rename device_config --> aconfig and definitions --> declarations" am: 9ccb457588 am: 958b906ed8
Original change: https://android-review.googlesource.com/c/platform/build/+/2633872

Change-Id: I6e51f481e4ea50cdcd0006dd95cfab65d52fd061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 14:49:02 +00:00
Joe Onorato
958b906ed8 Merge "Rename device_config --> aconfig and definitions --> declarations" am: 9ccb457588
Original change: https://android-review.googlesource.com/c/platform/build/+/2633872

Change-Id: I0cb0c21ac2df9a34caf4e82346007674f49c97d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 14:10:22 +00:00
Joe Onorato
9ccb457588 Merge "Rename device_config --> aconfig and definitions --> declarations" 2023-06-22 13:30:53 +00:00
Treehugger Robot
4aaa91f051 Merge "Handle symlinks when extracting zipfiles" am: 0e5e1749bb am: f6399f8b17 am: 444bb1c08e am: 767b6bc6e8 am: 4e33f13f1e
Original change: https://android-review.googlesource.com/c/platform/build/+/2632808

Change-Id: I99275e97cb5904a8e12e3f5ff01f00ee522dfe07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 05:24:40 +00:00
Treehugger Robot
4e33f13f1e Merge "Handle symlinks when extracting zipfiles" am: 0e5e1749bb am: f6399f8b17 am: 444bb1c08e am: 767b6bc6e8
Original change: https://android-review.googlesource.com/c/platform/build/+/2632808

Change-Id: Ibf070921e6c774a1a82d532ec4211f51063ce770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 04:44:20 +00:00
Treehugger Robot
767b6bc6e8 Merge "Handle symlinks when extracting zipfiles" am: 0e5e1749bb am: f6399f8b17 am: 444bb1c08e
Original change: https://android-review.googlesource.com/c/platform/build/+/2632808

Change-Id: Iaa75915a875a76df5d654cc60001dce4a52ad6d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 03:59:23 +00:00
Treehugger Robot
444bb1c08e Merge "Handle symlinks when extracting zipfiles" am: 0e5e1749bb am: f6399f8b17
Original change: https://android-review.googlesource.com/c/platform/build/+/2632808

Change-Id: I621b9721fb70f2be5a3ca0b559ea9cdf0b7e25d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 03:08:27 +00:00
Treehugger Robot
f6399f8b17 Merge "Handle symlinks when extracting zipfiles" am: 0e5e1749bb
Original change: https://android-review.googlesource.com/c/platform/build/+/2632808

Change-Id: I4316f46baf8d79390a892c1391b89ea50487e4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 02:29:29 +00:00
Kelvin Zhang
b7dc0481c6 Handle symlinks when extracting zipfiles
python3.11's zipfile implementation does not handle symlinks. This
causes important symlinks in ramdisk to be broken, and later causing a
boo failure.

Test: unzip a target files with symlinks, make sure symlinks are created
Bug: 287896098
(cherry picked from https://android-review.googlesource.com/q/commit:e473ce9e805d1eb303de2b020c5a634f632f6c3c)
Merged-In: Ia7d6ac8ffb03807680a36ff648aa11afafb7f481
Change-Id: Ia7d6ac8ffb03807680a36ff648aa11afafb7f481
2023-06-22 02:09:00 +00:00
Treehugger Robot
0e5e1749bb Merge "Handle symlinks when extracting zipfiles" 2023-06-22 01:27:35 +00:00
Joe Onorato
6aa48f8c5f Rename device_config --> aconfig and definitions --> declarations
Bug: 285303012
Test: for x in next trunk trunk_food trunk_staging ; do lunch aosp_panther-$x-eng ; m nothing ; done
Change-Id: I174ce3e609fa9077ea6bc61679ddb83e8efe57c8
2023-06-21 15:18:15 -07:00
Xin Li
7f534ea9b9 Merge Android 13 QPR3
Bug: 275386652
Merged-In: I33c7269d88483337838d4f4291d8639623633a5a
Change-Id: I56d23100e4b1b2d0d0df57873c0db3bd24de617e
2023-06-21 15:17:49 -07:00
Wei Li
3e9aaa896a Merge "Support SBOM generation of m build unbundled APEXs." am: 8968aa544b am: d0f23a62b8 am: 572a3cca73 am: bec91f56e8 am: 502040abc7
Original change: https://android-review.googlesource.com/c/platform/build/+/2631450

Change-Id: I1ba328a3b2d58b5c376bb1d0a6d32a74498fa7e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 22:01:25 +00:00
Wei Li
502040abc7 Merge "Support SBOM generation of m build unbundled APEXs." am: 8968aa544b am: d0f23a62b8 am: 572a3cca73 am: bec91f56e8
Original change: https://android-review.googlesource.com/c/platform/build/+/2631450

Change-Id: I9de4fc1c306308dc98e32d750f95e14a22a713f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:15:14 +00:00
Kelvin Zhang
e473ce9e80 Handle symlinks when extracting zipfiles
python3.11's zipfile implementation does not handle symlinks. This
causes important symlinks in ramdisk to be broken, and later causing a
boo failure.

Test: unzip a target files with symlinks, make sure symlinks are created
Bug: 287896098

Change-Id: Ia7d6ac8ffb03807680a36ff648aa11afafb7f481
2023-06-21 13:31:26 -07:00
Wei Li
bec91f56e8 Merge "Support SBOM generation of m build unbundled APEXs." am: 8968aa544b am: d0f23a62b8 am: 572a3cca73
Original change: https://android-review.googlesource.com/c/platform/build/+/2631450

Change-Id: Ie1845a9a0fd55d531fce2994aca44cd8246034b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 20:30:18 +00:00
Wei Li
572a3cca73 Merge "Support SBOM generation of m build unbundled APEXs." am: 8968aa544b am: d0f23a62b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2631450

Change-Id: I530acfee2343cd882ec535ab10dbb9874ce2ce57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 19:22:49 +00:00
Gabriel Biren
8944dfea27 Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." am: a58ce5e9d3 am: 8fee18a6f3 am: 779ea19ecd am: ef675cc35a am: 065ac12312
Original change: https://android-review.googlesource.com/c/platform/build/+/2627737

Change-Id: I0f7e9bf25990b5b078b852efdb6fbb103efe1315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 18:57:52 +00:00
Wei Li
d0f23a62b8 Merge "Support SBOM generation of m build unbundled APEXs." am: 8968aa544b
Original change: https://android-review.googlesource.com/c/platform/build/+/2631450

Change-Id: Ib264a1079d7d6f6f1aa2f77d75d7400fbab1d66d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 18:35:59 +00:00
Gabriel Biren
065ac12312 Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." am: a58ce5e9d3 am: 8fee18a6f3 am: 779ea19ecd am: ef675cc35a
Original change: https://android-review.googlesource.com/c/platform/build/+/2627737

Change-Id: I08f022a9922456c8561bfdbfc0be30246adc8184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 18:13:30 +00:00
Wei Li
8968aa544b Merge "Support SBOM generation of m build unbundled APEXs." 2023-06-21 17:50:17 +00:00
Gabriel Biren
ef675cc35a Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." am: a58ce5e9d3 am: 8fee18a6f3 am: 779ea19ecd
Original change: https://android-review.googlesource.com/c/platform/build/+/2627737

Change-Id: I2a18e0ab5c2998e1d7f61f81d66c1bb01545641f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 17:29:42 +00:00