StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,516 Commits 1 Branch 0 Tags
b51cfc63a5c2f6b9f58873241d7a79efa6e5c10c
Commit Graph

89516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Treehugger Robot
0e5e1749bb Merge "Handle symlinks when extracting zipfiles" 2023-06-22 01:27:35 +00:00
Android Build Coastguard Worker
7fa11c802e Make change and version bump to UP1A.230622.001 
Snap for 10360508 from 9ea49efa29 to udc-release

Change-Id: I333e1c8cdfb7c8fabe6c5ee87f5487c33853d9bb
 2023-06-21 23:44:47 +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
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
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
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
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
Android Build Coastguard Worker
3767963a61 [coastguard skipped] Merge sparse cherrypicks from sparse-10347885-L13600000961454114 into udc-release. 
COASTGUARD_SKIP: I963a7e2a1e8fecbb2731e390419a7574ee36653e

Change-Id: Icf98299337a4a799aa24e8fb58bc587c569d9c6f
 2023-06-21 05:05:53 +00:00
Android Build Coastguard Worker
2367ed4792 Version bump to UP1A.230620.001.X1 [core/build_id.mk] 
Change-Id: I963a7e2a1e8fecbb2731e390419a7574ee36653e
 2023-06-21 05:01:02 +00:00
Android Build Coastguard Worker
95d759a30e Make change and version bump to UP1A.230621.001 
Snap for 10353861 from 9ea49efa29 to udc-release

Change-Id: I92b236dff5013b172f5f97f7e786e0ecba25aa5c
 2023-06-21 01:48:01 +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
2302e3c4be Merge "aconfig: make proto fields optional" am: a3b0027fdb am: 0201a71f0c am: a34196902b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627237

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

Change-Id: I59b511d99376a364cca6dc74e9c1fb1a97995943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 20:47:13 +00:00
Florian Mayer
bfec611d38 [automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9 -s ours 
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055 is already in history

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

Change-Id: I59268504ab66e848bdeb2fbad756ffee8d30ef2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 20:24:10 +00:00
Florian Mayer
78fcb463be [automerger skipped] Fix bug when memtag_heap in diag but not sanitizers am: 0f79319bb8 -s ours 
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055 is already in history

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

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

Change-Id: I697af95c091cf919fe0f094c03d83f99834d4ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 20:05:02 +00:00
Florian Mayer
ffd1290cc9 Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev 2023-06-20 19:50:47 +00:00
Zhi Dou
5ace4a9cc3 Merge "aconfig: generate Java flag name constants" am: cff292f8b2 am: 1f7e9252ed am: 6b29eed1a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170

Change-Id: I72c9c984f1e5f7380e027c6e6ada23c333a296a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 18:58:44 +00:00
Mårten Kongstad
a3b0027fdb Merge "aconfig: make proto fields optional" 2023-06-20 18:47:08 +00:00
Wei Li
7c4f064a2b Support SBOM generation of m build unbundled APEXs. 
Bug: 266726655
Test: banchan com.android.adbd arm64 userdebug && m dist
Test: build/soong/tests/sbom_test.sh
Change-Id: I7abadbc083ef66b0e8ace28de69a1a219670ec37
 2023-06-20 11:23:56 -07:00
Zhi Dou
6b29eed1a1 Merge "aconfig: generate Java flag name constants" am: cff292f8b2 am: 1f7e9252ed 
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170

Change-Id: Ib3c13cc9bb688aba2d458dd928b92dc77ce369a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 18:13:31 +00:00
Zhi Dou
1f7e9252ed Merge "aconfig: generate Java flag name constants" am: cff292f8b2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170

Change-Id: I21da79301c4dc8828c6b4b48923720121dc91342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:32:16 +00:00
Treehugger Robot
0531aac817 Merge "aconfig: use proto struct directly" am: 23788f85a4 am: 7639e644a3 am: 6a5ce4a2a9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628052

Change-Id: I92b8b44af3956702740f508119c491222fff659c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:28:39 +00:00
Zhi Dou
cff292f8b2 Merge "aconfig: generate Java flag name constants" 2023-06-20 16:53:53 +00:00