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

34570 Commits

Author SHA1 Message Date
Wei Li
83cdd1f97d Merge "Include static libraries information in Android SBOM." am: c20175155a am: 7f298d8a1a am: 98a187fb69 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475

Change-Id: I16510d59533dc69cbeeeddaefaba91e691631949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 00:19:01 +00:00
Wei Li
98a187fb69 Merge "Include static libraries information in Android SBOM." am: c20175155a am: 7f298d8a1a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475

Change-Id: Ic7b8cc18a72785db9b8401ff9f29295512d4a05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 23:31:21 +00:00
Wei Li
7f298d8a1a Merge "Include static libraries information in Android SBOM." am: c20175155a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475

Change-Id: I342757931802a04dd09d0f50e3eea2219fdd5948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 22:51:32 +00:00
Wei Li
c20175155a Merge "Include static libraries information in Android SBOM." 2023-06-19 22:02:20 +00:00
Jiakai Zhang
96b155c018 Add an entry in METADATA.txt to determine whether to use the CMC GC. 
If the device uses the CMC GC, the file will contain:
extra-args = --runtime-arg -Xgc:CMC

Otherwise, the file will contain an empty line:
extra-args =

Bug: 287652269
Test: -
  1. m dist out/dist/boot.zip
  2. unzip -p out/dist/boot.zip METADATA.txt
Change-Id: I3d50367eb2a341e1c03286d7a2cd7ed44d59708f
 2023-06-19 20:20:05 +01:00
Wei Li
d263695cd4 Include static libraries information in Android SBOM. 
Bug: 280852724
Test: CIs
Test: lunch aosp_cf_x86_64_phone-userdebug && m sbom
Change-Id: Ie2365d79ba24910b7ace132b578589be10a17d78
 2023-06-16 23:02:09 -07:00
Gabriel Biren
fdcf16f55c Add rule to convert WIFI_FEATURE_IMU_DETECTION 
to the equivalent soong variable.

Bug: 287607876
Test: Manual test - add a log message to wifi_ext that
       only prints if the proper flag is enabled.
       Check whether the log is displayed, both before
       and after this change.
Change-Id: Id9bfc81384384b915e9772a2016a9843a57897db
 2023-06-16 21:11:10 +00:00
Jooyung Han
db9d2f09b7 Merge "Remove --blkid_path argument" am: e4635b3e04 am: 4941f6fd47 am: da705680d7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624574

Change-Id: Idebb626816eebee2f789ec7d372a0a016d192ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 08:36:48 +00:00
Jooyung Han
da705680d7 Merge "Remove --blkid_path argument" am: e4635b3e04 am: 4941f6fd47 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624574

Change-Id: Ia86ed1a4ab746e17237156d6e2832785c4bfdf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 08:11:35 +00:00
Jooyung Han
4941f6fd47 Merge "Remove --blkid_path argument" am: e4635b3e04 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624574

Change-Id: Icb064093d587479713e7da5bd670d4cb36f977a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 07:30:28 +00:00
Jooyung Han
e4635b3e04 Merge "Remove --blkid_path argument" 2023-06-16 06:48:57 +00:00
Justin Yun
06da561907 Merge "Use map_file_generator only for the supported file systems" am: cf92cdff7c am: 514a12d7af am: 8caeb6494a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627751

Change-Id: I3045182922c2d5ac5bd0f5f8d523bf25bca5511a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 02:01:29 +00:00
Justin Yun
8caeb6494a Merge "Use map_file_generator only for the supported file systems" am: cf92cdff7c am: 514a12d7af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627751

Change-Id: Ic0dd79a9c49d3927d257a40a824d216acf3916df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 01:16:18 +00:00
Justin Yun
514a12d7af Merge "Use map_file_generator only for the supported file systems" am: cf92cdff7c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627751

Change-Id: I968de85f8e094ec73d7247275ad9c374ddda009b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 00:31:08 +00:00
Justin Yun
a8a5a3ff62 Use map_file_generator only for the supported file systems 
map_file_generator can generate map files from erofs and ext# file
systems. Check the file system type and copy images and generate map
files if supported. Otherwise skip these steps.
If the image files are not copied, add_img_to_target_files will
generate the image files and map files.

Bug: 286870582
Test: lunch bertha_x86_64-userdebug && m dist
Change-Id: Ib92dd989cf61b1e376107a507eae9222ceb1d0d4
 2023-06-16 00:10:33 +09:00
Treehugger Robot
5a574ba328 Merge "Allow map_file_generator to use host tools" am: 4b47e8a2f3 am: 8e448f3c53 am: f38825b891 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624300

Change-Id: I2d58aade85c63ba2df6b3c1ac1022d12c424f542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:32:47 +00:00
Treehugger Robot
f38825b891 Merge "Allow map_file_generator to use host tools" am: 4b47e8a2f3 am: 8e448f3c53 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624300

Change-Id: I3f51ea283775281bf5cbf6a9f9b51032fdb11d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 17:47:28 +00:00
Treehugger Robot
8e448f3c53 Merge "Allow map_file_generator to use host tools" am: 4b47e8a2f3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624300

Change-Id: Ic68b479538759e5ab5a6de21ced4e9cc5537669e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 17:01:39 +00:00
Treehugger Robot
4b47e8a2f3 Merge "Allow map_file_generator to use host tools" 2023-06-14 16:25:26 +00:00
Jooyung Han
629490292a Remove --blkid_path argument 
deapexer doesn't need it.

Bug: 279858383
Test: presubmit
Change-Id: If0ec42b5edd4642f07c96ba641030c4dd6fb4660
 2023-06-14 15:16:34 +09:00
Treehugger Robot
4e9fe359d6 Merge "Move MTE mode settings to a product variable." am: c37e824f56 am: ec810624c2 am: 57a758393e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622658

Change-Id: Id114e0cc956d1257241f08930bac54882696bc99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:02:48 +00:00
Treehugger Robot
57a758393e Merge "Move MTE mode settings to a product variable." am: c37e824f56 am: ec810624c2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622658

Change-Id: Ie4909a3b9f21d29836125d200c9e0a1cf5922cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 03:16:07 +00:00
Treehugger Robot
ec810624c2 Merge "Move MTE mode settings to a product variable." am: c37e824f56 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622658

Change-Id: I8dbb33a6f23421e43f27cb54aa88f39f4dab8e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 02:33:07 +00:00
Treehugger Robot
c37e824f56 Merge "Move MTE mode settings to a product variable." 2023-06-14 01:42:22 +00:00
Kelvin Zhang
0eba102f19 Allow map_file_generator to use host tools 
map_file_generator need to invoke binaries such as `unsquashfs` .
These binaries are built from android source tree, so add host binary
output directory to PATH variable so that map_file_generator can use
these binaries.

Test: th
Bug: 286870582
Change-Id: I56634293ee885fc4612627578a22cdf57bc13bfc
 2023-06-13 18:24:15 -07:00
Yabin Cui
f1b88bb0a9 Replace libc++.so.1 with libc++.so 
After clang update (with aosp/2590665), clang prebuilts now depend on libc++.so
instead of libc++.so.1.

Bug: 287115146
Test: presubmit
Change-Id: If2fc9411e7eb5542896f3cdce9adea786451ddbc
 2023-06-13 21:55:38 +00:00
Daniel Zheng
3d024c61a9 Merge "Add dt partition in fastboot-info" am: 0fd9651321 am: 190f8ca236 am: 2b57d75a06 
Original change: https://android-review.googlesource.com/c/platform/build/+/2621218

Change-Id: I71f7027457821220e8d48f57f897823d1a52e038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 20:53:35 +00:00
Florian Mayer
0f79319bb8 Fix bug when memtag_heap in diag but not sanitizers 
Without this we get:
unsupported argument 'memtag_heap' to option '-fno-sanitize-trap='
(cherry picked from https://android-review.googlesource.com/q/commit:2a6762605574d6fbcea63e9d5e18d184e241417d)

Bug: 286415307
Merged-In: Iaeb23d0f4962bb3d788036fadc14b9420221a38e
Change-Id: Iaeb23d0f4962bb3d788036fadc14b9420221a38e
 2023-06-13 20:14:50 +00:00
Evgenii Stepanov
80b53b8c77 Move MTE mode settings to a product variable. 
Allow product configuration of memtag target list by
moving the current set into a product variable instead of the various
.bp files.

The default list of memtag targets can be found in
  build/make/target/product/memtag-common.mk

This is NFC as all targets in the list already have "memtag_heap: true"
in the build files.

Bug: 280343521
Test: no functional change
Change-Id: I5954fde05256e00a8e01c114ad522f50ed0cfa9f
 2023-06-13 13:11:52 -07:00
Daniel Zheng
2b57d75a06 Merge "Add dt partition in fastboot-info" am: 0fd9651321 am: 190f8ca236 
Original change: https://android-review.googlesource.com/c/platform/build/+/2621218

Change-Id: I1a9223894b1e7434a5b078f85245bdabad5f8325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 20:04:46 +00:00
Daniel Zheng
190f8ca236 Merge "Add dt partition in fastboot-info" am: 0fd9651321 
Original change: https://android-review.googlesource.com/c/platform/build/+/2621218

Change-Id: Ia413512fa21562bc3ed72f608bd58826b7b21044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 18:27:16 +00:00
Daniel Zheng
0fd9651321 Merge "Add dt partition in fastboot-info" 2023-06-13 17:35:59 +00:00
Joe Onorato
6ccc3a5f58 Merge "Allow and merge multiple release configs with the same name" am: ac57d98b87 am: caee07b951 am: 6f23f12697 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622584

Change-Id: If75b68308bfe08717d616345c0c882e812ad7b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 17:23:32 +00:00
Joe Onorato
6f23f12697 Merge "Allow and merge multiple release configs with the same name" am: ac57d98b87 am: caee07b951 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622584

Change-Id: I4932048d776a7ef53485817b71fa17a55b5fbf99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 16:36:58 +00:00
Joe Onorato
caee07b951 Merge "Allow and merge multiple release configs with the same name" am: ac57d98b87 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622584

Change-Id: I4375335402a88f191ffdc47d3acd96ca2baab161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 15:57:25 +00:00
Joe Onorato
ac57d98b87 Merge "Allow and merge multiple release configs with the same name" 2023-06-13 15:13:04 +00:00
TreeHugger Robot
d833e73b8b Merge changes from topic "cherrypicker-L60200000961213913:N41200001377797274" into udc-dev 
* changes:
  Avoid using soong_zip's "-e" flag for boot.zip.
  Add mainline extension and METADATA.txt to boot.zip.
 2023-06-13 14:28:56 +00:00
Treehugger Robot
d8e0caf591 Merge "Use Z_BEST_COMPRESSION for compress-package" am: 913c41caf5 am: 48c52a56be am: 6d89447e73 
Original change: https://android-review.googlesource.com/c/platform/build/+/2554371

Change-Id: I178ec7bf8d339a743da8143e628e5e27e0b4162e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 12:07:18 +00:00
Treehugger Robot
6d89447e73 Merge "Use Z_BEST_COMPRESSION for compress-package" am: 913c41caf5 am: 48c52a56be 
Original change: https://android-review.googlesource.com/c/platform/build/+/2554371

Change-Id: I711a139637612ea4c29c581f1206ef4d850f60e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 11:21:45 +00:00
Treehugger Robot
48c52a56be Merge "Use Z_BEST_COMPRESSION for compress-package" am: 913c41caf5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2554371

Change-Id: Ie1b1d6d032981821925e047215a13b9e358595ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 10:42:00 +00:00
Treehugger Robot
913c41caf5 Merge "Use Z_BEST_COMPRESSION for compress-package" 2023-06-13 10:09:54 +00:00
Joe Onorato
1f6555151e Allow and merge multiple release configs with the same name 
For now (to prevent build breakages when this is submitted), duplicate
flag values are allowed, but that will be disallowed once this change
automerges everywhere.

Bug: 286689485
Test: Treehugger
Change-Id: I723340ff9751b61d33c4108b0cc2f90702a116c9
 2023-06-12 23:29:25 -07:00
Lokesh Kumar Goel
00246a4c8d Update Security String to 2023-08-05 am: be93b44331 am: 8f4fa29b84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23556019

Change-Id: Iff50cdb189b240ace80d3677df1d78d1423cbdfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:05:47 +00:00
Lokesh Kumar Goel
8f4fa29b84 Update Security String to 2023-08-05 am: be93b44331 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23556019

Change-Id: Idfa7e5dd2ed1f34e231ecda93d903b1692f1bdb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:32:02 +00:00
Lokesh Kumar Goel
91183a7c54 Update Security String to 2023-08-05 am: be93b44331 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23556019

Change-Id: I8098f2a65f8e7b3d8aa42aefe4aa98cdaaaf5ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:30:56 +00:00
Jiakai Zhang
81d75d5819 Merge "Avoid using soong_zip's "-e" flag for boot.zip." am: 9448754144 am: 6883343237 am: 46a512bc18 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622109

Change-Id: I9945b786e1add851a5ff9510ee7303a40b7a9760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:10:42 +00:00
Daniel Zheng
4d63271885 Merge "Removing --apply-vbmeta for vbmeta_system" am: d97f8505ae am: a5b20d6ef1 am: 85c879e407 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620094

Change-Id: Id657b97c854006235222a00bf4a44008e54c8fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:09:23 +00:00
Jiakai Zhang
46a512bc18 Merge "Avoid using soong_zip's "-e" flag for boot.zip." am: 9448754144 am: 6883343237 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622109

Change-Id: I211867b71c95b20ec6ea06c29d8f69e739a7b7d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 17:23:02 +00:00
Daniel Zheng
85c879e407 Merge "Removing --apply-vbmeta for vbmeta_system" am: d97f8505ae am: a5b20d6ef1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620094

Change-Id: I7239d9617644eca2f41148e778b544901d8b3e1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 17:22:12 +00:00
Daniel Zheng
8ad23cf151 Add dt partition in fastboot-info 
Adding dt partition in fastboot-info in case device uses it.

Test: m fastboot_info
Change-Id: Id5b3a70064f5ac6da8303f74c73e4d5f395a2c51
 2023-06-12 09:57:54 -07:00