Commit Graph

88516 Commits

Author SHA1 Message Date
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
Gabriel Biren
779ea19ecd Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." am: a58ce5e9d3 am: 8fee18a6f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2627737

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

Change-Id: I33c7269d88483337838d4f4291d8639623633a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 16:03:17 +00:00
Gabriel Biren
a58ce5e9d3 Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." 2023-06-21 15:19:51 +00:00
Treehugger Robot
4ff6dbe015 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb am: 1ff91ea214 am: adb009c0f5 am: eab5aff691
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I19f931f077b620a0b16d2243cae10659f4aff133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 09:03:35 +00:00
Treehugger Robot
eab5aff691 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb am: 1ff91ea214 am: adb009c0f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: Iee674951e793ef0378becd9b54d2338a41d410c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 08:24:24 +00:00
Treehugger Robot
adb009c0f5 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb am: 1ff91ea214
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I072e9977c10ea905c82ed7fddb27431447155b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:35:55 +00:00
Treehugger Robot
1ff91ea214 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: Ie855f1b5d0f4844165452135ab4fe1e75625c3ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:47:14 +00:00
Treehugger Robot
2a477ccdbb Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I26c965b0079dacc14c1b4a83ce545a919d7f33cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:08:08 +00:00
Jooyung Han
6d273b9624 Do not pass TARGET_FLATTEN_APEX to soong
Soong no longer supports "flattened" apex. This makes
TARGET_FLATTEN_APEX no-op.

Will remove TARGET_FLATTEN_APEX later.

Bug: 279835185
Test: m && launch_cvd (cuttlefish)
Change-Id: I27c6181f5107fd27552304c5dd25d2c0a21c4bec
2023-06-21 14:22:00 +09:00
Treehugger Robot
d0c29cbdeb Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" 2023-06-21 05:18:58 +00:00
Florian Mayer
4671ae0fcf [automerger skipped] Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 am: ae2b8d5cc3 am: e9946b73ef -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 8bb740db1a is already in history

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

Change-Id: Icac8d8cfdfe08085fa2fc0651f57e8a92def7ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 01:20:13 +00:00
Florian Mayer
c71e5a36b3 [automerger skipped] Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 -s ours am: 026628a226 -s ours am: 0fd39c13f9 -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: Ia37d097273b56e1eb0aacacc11bca72b8ee73ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 01:13:48 +00:00
Florian Mayer
314771a1ed [automerger skipped] Add aosp_arm64_fullmte target am: 8bb740db1a -s ours am: ceac1f0d51 -s ours am: 32394dfeac -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: I925b9387daa1528a2a6186a3a48f7423e8a3f59d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 01:13:45 +00:00
Florian Mayer
0ed6a0bfd7 [automerger skipped] Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 am: ae2b8d5cc3 -s ours am: c885b8eef9 -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: I528fab1ab911838874c1902aec428dac282319fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 01:13:35 +00:00
Florian Mayer
e9946b73ef Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 am: ae2b8d5cc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678385

Change-Id: Ib3d93e07871f8e145e147b8a0ef3ec1d39ef2dc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 00:35:53 +00:00
Florian Mayer
0fd39c13f9 [automerger skipped] Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 -s ours am: 026628a226 -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: I7551797225314b4b63e49075830c9a93cc2ab945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 00:35:43 +00:00
Florian Mayer
32394dfeac [automerger skipped] Add aosp_arm64_fullmte target am: 8bb740db1a -s ours am: ceac1f0d51 -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: If50383af964ee9f6a34daa1a43a3092129443095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 00:35:38 +00:00
Florian Mayer
c885b8eef9 [automerger skipped] Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 am: ae2b8d5cc3 -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: I9d0cea33df19e9bfd771aefa3fe06cad7dd55938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 00:31:28 +00:00
Florian Mayer
ae2b8d5cc3 Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678385

Change-Id: Iedc8ba81a15a4dc542d1a774f7d79cc52ed1bca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 23:51:20 +00:00
Florian Mayer
026628a226 [automerger skipped] Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: I4214aca679deb43c1530038d1ebdd7707f4ab1af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 23:47:18 +00:00
Florian Mayer
ceac1f0d51 [automerger skipped] Add aosp_arm64_fullmte target am: 8bb740db1a -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: I8650d1e202ef829b73b6fd7abe09414f6bea06da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 23:47:15 +00:00
Florian Mayer
9ea49efa29 Merge "Add aosp_arm64_fullmte target" into udc-dev 2023-06-20 23:10:32 +00:00
Mårten Kongstad
e35e854508 Merge "aconfig: make proto fields optional" am: a3b0027fdb am: 0201a71f0c am: a34196902b am: 2302e3c4be am: 7e959f06eb
Original change: https://android-review.googlesource.com/c/platform/build/+/2627237

Change-Id: Ic333c743fa9204316b6ff21f8374077a544a3694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 23:02:28 +00:00
Mårten Kongstad
7e959f06eb Merge "aconfig: make proto fields optional" am: a3b0027fdb am: 0201a71f0c am: a34196902b am: 2302e3c4be
Original change: https://android-review.googlesource.com/c/platform/build/+/2627237

Change-Id: I1f9325e9fd62d114ae3e7b3bae3b566f3a6c5e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 22:18:44 +00:00