StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,484 Commits 1 Branch 0 Tags
2f2c110829e0bbceb65dc65751e0139a46eba2ac
Commit Graph

73484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pirama Arumuga Nainar
8fdd8e7553 Merge "Set a BIONIC_COVERAGE .mk variable" am: bd7e1a38ba 
Original change: https://android-review.googlesource.com/c/platform/build/+/1918952

Change-Id: I693064e34cb881687478d1106d9236299ba6f917
 2022-01-10 22:54:34 +00:00
Treehugger Robot
21e7285926 Merge "Embed host liblz4.so in target_files" 2022-01-10 22:50:51 +00:00
Pirama Arumuga Nainar
bd7e1a38ba Merge "Set a BIONIC_COVERAGE .mk variable" 2022-01-10 22:36:57 +00:00
Victor Hsieh
30afe79e30 Merge "Add min_sdk_version to BuildManifest.apk" am: 70ca7c6add 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941946

Change-Id: I7013798ad7c29443eb7c93e6612b157179d78de2
 2022-01-10 20:23:42 +00:00
Kelvin Zhang
6877e81467 Embed host liblz4.so in target_files 
This file will be used by OTA generator to compress generated patches.
We need the host copy of LZ4 to ensure that compressed bytes matches
what the device would get if the compression were to be done on device.
For more details see go/lz4diff

Bug: 206729162
Test: m dist

Change-Id: I9c4ab772b001bf47da75cb87b028a1f27e2321a8
 2022-01-10 12:12:21 -08:00
Victor Hsieh
70ca7c6add Merge "Add min_sdk_version to BuildManifest.apk" 2022-01-10 19:59:53 +00:00
Jiyong Park
efbb6ffa00 Add min_sdk_version to BuildManifest.apk 
sign_target_files_apks demands it.

Bug: 213823227
Test: run com.google.android.tradefed.ota.SigningToolTest#Testcase1_Signingtest
Change-Id: I1bba2b25a71449a57d284024e77fb76d1b79a0ee
 2022-01-10 20:14:05 +09:00
Jeff Vander Stoep
fe91d896ee Make com.android.sepolicy mandatory 
Bug: 199914227
Test: aosp/1910032
Change-Id: I23599517b427363e758e6f06763079cc1482cb47
Merged-In: I23599517b427363e758e6f06763079cc1482cb47
 2022-01-10 10:28:39 +00:00
Treehugger Robot
96d7aa5d1c Merge "Add sepolicy compat versions to soong config" am: 664dd48176 
Original change: https://android-review.googlesource.com/c/platform/build/+/1940869

Change-Id: I377b420689133c0c56309f647af89ac59522f5d4
 2022-01-10 02:30:03 +00:00
Treehugger Robot
664dd48176 Merge "Add sepolicy compat versions to soong config" 2022-01-10 02:09:22 +00:00
Treehugger Robot
3468085607 Merge "Add option to enable zucchini" am: dcd7e283d2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1939053

Change-Id: I1398da13f048093e8658baa5f3a16fc19a05a46d
 2022-01-09 20:53:51 +00:00
Treehugger Robot
dcd7e283d2 Merge "Add option to enable zucchini" 2022-01-09 20:38:18 +00:00
Martin Stjernholm
96cea0f44b Merge "Add an option to specify the path to aapt2." am: 76537be0a9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1938648

Change-Id: I8534ab25066bd863b3d64330da2d0a3aae835019
 2022-01-09 19:35:19 +00:00
Martin Stjernholm
76537be0a9 Merge "Add an option to specify the path to aapt2." 2022-01-09 19:11:49 +00:00
Yi-Yo Chiang
33f973fd2a Fix init_boot partition AVB signing 
Typo: 'BOARD_AVB_INIT_BOOT_IMAGE_KEY_PATH' ->
  'BOARD_AVB_INIT_BOOT_KEY_PATH'

Record avb_init_boot_* arguments to misc_info.txt

Add INIT_BOOT_SECURITY_PATCH to support per-partition SPL.

Bug: 203698939
Test: avbtool info_image --image init_boot.img
Change-Id: I63e082b1dd675138a6ab5cceb8814b3673d26b13
 2022-01-09 16:28:25 +08:00
Treehugger Robot
4f8d04b603 Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I38c3f73271a7b2daa9ab4fe877c5bf39933fd5f8
 2022-01-08 18:37:28 +00:00
Treehugger Robot
6a95477b0f Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" 2022-01-08 18:20:12 +00:00
Yi-Yo Chiang
8193900f87 Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B))) 
Else the branch condition would always evaluate to true, making the
other branch useless and wrong!

Bug: 211741246
Test: m dist
Change-Id: I4791712632cbe0d5a9e20962c8425dd20bbe0bfd
 2022-01-08 15:59:02 +00:00
Treehugger Robot
77f7f00e3d Merge "Write signature size even when it's empty" am: 555c3a7dc7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1938523

Change-Id: I694f6cf73b31f63c2bbc10e7748320adc4d8b116
 2022-01-08 02:27:21 +00:00
Treehugger Robot
2dbcae4a5a Merge "Fix GetCareMap for small images" am: 8ef44309b2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1940646

Change-Id: I2232100525f8ae17ea886f3923557244568f5dd9
 2022-01-08 02:27:11 +00:00
Treehugger Robot
555c3a7dc7 Merge "Write signature size even when it's empty" 2022-01-08 02:20:11 +00:00
Treehugger Robot
8ef44309b2 Merge "Fix GetCareMap for small images" 2022-01-08 02:14:02 +00:00
Martin Stjernholm
58472e8609 Add an option to specify the path to aapt2. 
Thin manifests (e.g. master-art) may not have the aapt2 sources and
instead relies on the prebuilt in prebuilts/sdk/tools/linux/bin. In
that case there's no aapt2 in the search path, so it needs to be
specified.

Test: Heavy presubmit build on mainline_modules_bundles on git_master
Test: vendor/google/modules/ArtGoogle/build-art-module.sh
  with http://ag/16584845 on git_master-art, where only the prebuilt
  aapt2 is present
Bug: 212462945
Change-Id: I41a22e8146f5a88534c2721345b4d9d64f76698c
 2022-01-07 23:08:53 +00:00
Kelvin Zhang
410bb389d8 Add option to enable zucchini 
Change-Id: Id952826c9c5af912fba679af61f2a2e1645641dd
 2022-01-07 14:59:01 -08:00
Kelvin Zhang
98ef7bb157 Fix GetCareMap for small images 
Change-Id: Iac518e36dbb2fe9303e84d502cd7dfe74621c0af
 2022-01-07 14:59:01 -08:00
Treehugger Robot
c10c51039e Merge "Add missing dependencies of fs-verity manifest APK" am: d541c6c898 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941183

Change-Id: I5df8c04c4660fa930b57dd8a9fc4757724885d2c
 2022-01-07 22:48:29 +00:00
Treehugger Robot
d541c6c898 Merge "Add missing dependencies of fs-verity manifest APK" 2022-01-07 22:28:25 +00:00
Victor Hsieh
fb3ef8a59f Generate .fsv_meta for more files 
For system/framework, it now also includes *.jar.prof (needed by
odrefresh), *.vdex and <arch>/*.{odex,art} (for future-proof).

system/etc/classpaths/*.pb are also added so that we can run
derive_classpath to collect from.

system/etc/updatable-bcp-packages.txt is removed because it's no longer
used by ART.

Bug: 206869687
Test: see new files in `unzip -p $OUT/system/etc/security/fsverity/ \
      BuildManifest.apk assets/build_manifest.pb`
Change-Id: Id759f5caec8ba683af8629956b9268a4fbd74186
 2022-01-07 14:12:11 -08:00
Cole Faust
64c2ddb619 Add TARGET_RECOVERY_FSTAB_GENRULE 
This variable can be set instead of TARGET_RECOVERY_FSTAB
in order to specify a generated fstab file.

Bug: 201700692
Test: Presubmits
Change-Id: If0fae81ec53915e9ed4bab2e8b1a9f8376894537
 2022-01-07 13:50:54 -08:00
Victor Hsieh
be1029af71 Add missing dependencies of fs-verity manifest APK 
Otheriwse, the build complains about missing files when
PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA is enabled (aosp/1937717).

Bug: 206326351
Test: clobber, set PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA := true, build
Change-Id: I11d18914d63cab0b84ae711f2334747cb26ca234
 2022-01-07 11:07:52 -08:00
Bill Yi
0e8235cbfe [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 1ebd070c8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1fe1d646ac6a2881216196849401534fc09ea3a2
 2022-01-07 17:48:53 +00:00
Bill Yi
1ebd070c8d Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" 2022-01-07 17:29:11 +00:00
Treehugger Robot
a029ebb6dc Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" am: 097f6bc1da 
Original change: https://android-review.googlesource.com/c/platform/build/+/1908872

Change-Id: I59037fa9eb46f8abf22f26e8c3f77c5cc68eb341
 2022-01-07 13:28:43 +00:00
Treehugger Robot
03990e11c4 Merge "Add a.hardware.audio.common and a.media.audio.common" am: 1c2c284063 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937128

Change-Id: I7e3c5ef5a50f6ebe8efca6d409fcd6bab19c9fc2
 2022-01-07 13:26:35 +00:00
Treehugger Robot
097f6bc1da Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" 2022-01-07 13:07:25 +00:00
Treehugger Robot
1c2c284063 Merge "Add a.hardware.audio.common and a.media.audio.common" 2022-01-07 13:07:10 +00:00
Inseob Kim
934aaaffa6 Add sepolicy compat versions to soong config 
Bug: 33691272
Test: build
Change-Id: Idef2efb8bb9ea6ea2b4bd072b4e75296b12294d1
 2022-01-07 19:16:34 +09:00
Yi-yo Chiang
21013eaa18 Merge "Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ec918431a5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1860893

Change-Id: Iaa9365f9f6ff51a7accb95da3093886969925b9d
 2022-01-07 05:42:41 +00:00
Yi-yo Chiang
5efc0feefa Merge "Unconditionally copy the system build.prop into target_files archive" am: 5709c4a93f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1935974

Change-Id: I1801eff75b29ed42fbde2129e2366ec8ae0b5969
 2022-01-07 05:42:24 +00:00
Yi-yo Chiang
ec918431a5 Merge "Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" 2022-01-07 05:30:23 +00:00
Yi-yo Chiang
5709c4a93f Merge "Unconditionally copy the system build.prop into target_files archive" 2022-01-07 05:27:35 +00:00
Treehugger Robot
2d6411ed06 Merge "Move fsverity metadata generation to Makefile" am: 7c88c9c1e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937129

Change-Id: I67b18122ed2fae0ad5a4f0684e257fd6f21063fc
 2022-01-07 03:48:55 +00:00
Treehugger Robot
7c88c9c1e6 Merge "Move fsverity metadata generation to Makefile" 2022-01-07 03:37:16 +00:00
Treehugger Robot
a551c5d3d1 Merge "Avoid packing ramdisk into GKI boot-*.img" am: bd5fd25265 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937120

Change-Id: I3d581b4d908ba8ab4760dc0ee415736f6406108a
 2022-01-07 02:51:51 +00:00
Bill Yi
5a77fbf008 Merge sc-qpr1 to aosp-master - DO NOT MERGE 
Merged-In: I017a5d9c3cd227e0b1a4deaa8dface646bc0a887
Merged-In: I71f542d511cf6397d84d40b1fb688c307cdd386e
Change-Id: Id5d2b7b2b18ae1a1919a53121c06fb309e5b2eee
 2022-01-06 18:38:30 -08:00
Treehugger Robot
bd5fd25265 Merge "Avoid packing ramdisk into GKI boot-*.img" 2022-01-07 02:35:06 +00:00
Inseob Kim
3d5ae80f50 Write signature size even when it's empty 
Normally this has no effect, but when we generate metadata for small
files (<=4KB), merkle tree isn't generated. In such case, writing zero
will make the metadata format simpler and unconditional.

Test: manual
Change-Id: Ibe18175b580af3409c896a8bb97323792ad9c459
 2022-01-07 10:56:17 +09:00
Bill Yi
4867e1ad0e Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2022-01-07 01:41:28 +00:00
Treehugger Robot
2a04f251b9 Merge "Export test data dependencies in module-info" am: 802c86f831 
Original change: https://android-review.googlesource.com/c/platform/build/+/1928387

Change-Id: I017a5d9c3cd227e0b1a4deaa8dface646bc0a887
 2022-01-07 00:54:01 +00:00
Treehugger Robot
802c86f831 Merge "Export test data dependencies in module-info" 2022-01-07 00:36:54 +00:00