StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,178 Commits 1 Branch 0 Tags
4c0ac42c0601fb9cb1524f78565a2fcffdf5dde1
Commit Graph

2556 Commits

Author SHA1 Message Date
Devin Moore
0edf9bf06c Merge "Get build.prop for init_boot.img from the ramdisk props" am: c3ee009f38 am: 192130b75e am: 605baddf83 
Original change: https://android-review.googlesource.com/c/platform/build/+/1983226

Change-Id: I56b81e196e1f749e7b2a2c41d00c993cd4d8dcc2
 2022-02-14 18:12:40 +00:00
Devin Moore
b5195ff5fe Get build.prop for init_boot.img from the ramdisk props 
boot.img and init_boot.img get their build properties from the platform
ramdisk properties.

Test: "m dist" then drop the OTA zip file into
android.github.io/analyseOTA to verify init_boot is present.
Bug: 211823573

Change-Id: I411e62bf0fc3cb49d4b12dadb52d9820fca041fa
 2022-02-11 18:44:26 +00:00
Treehugger Robot
dc04f552d5 Merge "Fix signing failure when no entry to convert to store" am: ea586a8d71 am: 8e9b39e061 am: 9c03d6a61e am: b3c67ad42e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1978755

Change-Id: I5a28c53819b7b7f99851cddb3ff0f7363c6c11d4
 2022-02-10 13:57:06 +00:00
Treehugger Robot
ea586a8d71 Merge "Fix signing failure when no entry to convert to store" 2022-02-10 12:53:00 +00:00
Kelvin Zhang
c2ea9cec01 Merge "Support relative key path in VerifiedBootVersion2VerityImageBuilder" am: b69bcdec29 am: cdd4c44b43 am: e1c32a82ed am: 2199bf3cdc 
Original change: https://android-review.googlesource.com/c/platform/build/+/1976677

Change-Id: I0b2e9b09d3fa0e798907d14902bcf88037f07b27
 2022-02-10 05:42:47 +00:00
Kelvin Zhang
b69bcdec29 Merge "Support relative key path in VerifiedBootVersion2VerityImageBuilder" 2022-02-10 04:42:35 +00:00
Treehugger Robot
4cb64a50b6 Merge "Fix python3 errors: "TypeError: write() argument must be str, not bytes"" am: 955ee3712d am: 2e44a5303c am: 40e9d87fdf am: 68e1e13857 
Original change: https://android-review.googlesource.com/c/platform/build/+/1977398

Change-Id: I5209aadac8bc3e85b8e1a7be20f7fe554237a79f
 2022-02-10 00:33:32 +00:00
Kelvin Zhang
70876143b5 Fix signing failure when no entry to convert to store 
zip -d doesn't work when no entry names specified. So if the list of
entry is empty, just skip calling zip -d.

Bug: 218438888

Test: th
Change-Id: Ie4419b9d6fdc2780255c6f12f9f4d35e5c0a7b26
 2022-02-09 16:07:29 -08:00
Oleksiy Avramchenko
166d819fe4 Support relative key path in VerifiedBootVersion2VerityImageBuilder 
Otatools archive can be unpacked to an arbitrary directory together
with bundled external/avb/test/data keys. Calling add_img_to_target_files
from a different directory fails to build an image which has
avb_{}_key_path pointing to the bundled key since add_hash_footer
can't find the key file.

Fix this by applying the same logic as in common.AppendAVBSigningArgs.

Steps to reproduce:
$ . build/envsetup.sh && lunch aosp_cf_arm64_phone-userdebug && make dist
$ cd out/dist && rm -rf otatools && unzip otatools.zip -d otatools
$ zip -d aosp_cf_arm64_phone-*target_files*.zip IMAGES/system_other.img
$ otatools/bin/add_img_to_target_files -a -v -p otatools \
    aosp_cf_arm64_phone-target_files-*.zip

Bug: 218531463
Test: manual, see "steps to reproduce" above
Change-Id: Id3f7cf2678e998ef1beda2b6741944c6455c2404
 2022-02-09 19:47:18 +01:00
Iavor-Valentin Iftime
756b56125a Fix python3 errors: "TypeError: write() argument must be str, not bytes" 
Bug: 186097910

Change-Id: I191c3230596026ee327c1403a6c72fbfa6fdb2d9
 2022-02-09 16:02:33 +00:00
Treehugger Robot
c3c1130bbb Merge "system_dlkm: add to the non AB ota" am: 6daac9c78d am: 08b63fb8fb am: ae1f809dd8 am: c2e6419962 
Original change: https://android-review.googlesource.com/c/platform/build/+/1978046

Change-Id: Ia9e5ae12048a9a4465f9ddb6a6b45b6c91b500e9
 2022-02-09 07:26:16 +00:00
Treehugger Robot
6daac9c78d Merge "system_dlkm: add to the non AB ota" 2022-02-09 06:18:43 +00:00
Ramji Jiyani
7ecb0ec9f8 system_dlkm: add to the non AB ota 
Test: TH
Bug: 200082547
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: Ib43ff411c17a96656a677e3a437e834884a0372f
 2022-02-09 02:53:07 +00:00
Jooyung Han
1a7e955e50 Merge "A custom APEX signing tool with --signing_args" am: 3a61599999 am: 82f355046c am: 67e7bd664e am: fe4f1b5169 
Original change: https://android-review.googlesource.com/c/platform/build/+/1974282

Change-Id: I946a3c8aba064f1bf1818e7ea3b0f125015f69f1
 2022-02-08 12:32:55 +00:00
Jooyung Han
3a61599999 Merge "A custom APEX signing tool with --signing_args" 2022-02-08 11:23:24 +00:00
Treehugger Robot
dbd92551b1 Merge "Update APK parser to be compatible with new signer output" am: c438d9aaca am: e1c3dd402c am: be0f59ef69 am: 6065b59220 
Original change: https://android-review.googlesource.com/c/platform/build/+/1976047

Change-Id: Ib6dd736f0bba43e2ad8876cefb65d80ba7c10f12
 2022-02-08 05:40:56 +00:00
Treehugger Robot
3eea1f7c08 Merge "Fix small misuse of pass" am: f6cd3a1ddd am: 2238917d48 am: ad058b477b am: ae4ff2fa35 
Original change: https://android-review.googlesource.com/c/platform/build/+/1976046

Change-Id: I5442f4b89666958c4af8bdd326732e6ca7fe63a1
 2022-02-08 04:59:15 +00:00
Kelvin Zhang
846f285d55 Update APK parser to be compatible with new signer output 
Test: th
Bug: 218304082
Change-Id: If79ffdb1e4cec192ef796a39dd0ed5b38bc430e0
 2022-02-07 16:38:09 -08:00
Kelvin Zhang
9d021e996b Fix small misuse of pass 
The intention is to skip current iteration of for loop, so 'continue'
should be used instead of 'pass'

Test: th
Change-Id: Ic955beeaef74100981b351e2e7807c7fde538783
 2022-02-07 16:38:09 -08:00
Kelvin Zhang
aee09174c7 Merge "Store EROFS images uncompressed" am: 691f8b93c7 am: 828c68767e am: d5ab964e6b am: 59e5a9a114 
Original change: https://android-review.googlesource.com/c/platform/build/+/1956494

Change-Id: I30657128360b0a1b3cfc014a49806ad56270a726
 2022-02-07 22:08:06 +00:00
Jooyung Han
39259ec1a4 A custom APEX signing tool with --signing_args 
apex_utils.SignApex() has `signing_args` argument which is supposed to
be passed to avbtool to set `--signing_helper` or
`--signing_helper_with_files`.

A custom APEX signing tool which relies on avbtool's signing should pass
the same arguments when signing_args is set.

This change passes signing_args verbatim to the custom APEX signing tool
via --signing_args argument.

Bug: 216971834
Test: tbd
Change-Id: I8aaec9440c4536e11e1e4a1dd4ae5f4fe32d4f23
 2022-02-07 15:56:53 +09:00
Kelvin Zhang
4a63e8e3c5 Merge "Add zhangkelvin@ as owner for release tools scripts" am: 3b72e28421 am: 075084d909 am: b748ae9f86 am: 8489a72ede 
Original change: https://android-review.googlesource.com/c/platform/build/+/1969479

Change-Id: Id71945739ce069c3ea9d288cf7efd568b9ebf8d8
 2022-02-03 04:13:41 +00:00
Kelvin Zhang
834f5d458f Store EROFS images uncompressed 
Test: th
Change-Id: I53005bee139079afe25da231ca1d42f03fa010a5
 2022-02-02 12:52:34 -08:00
Kelvin Zhang
4f8f972a5b Add zhangkelvin@ as owner for release tools scripts 
Change-Id: Ic861bc11d6a7d80c0d22a05ce35998753bb60752
 2022-02-02 12:52:34 -08:00
Treehugger Robot
fead7b745f Merge "core & tools: system_dlkm: add dynamic partition" am: ef25de413e am: 0f5c34115c am: b4a4dee4c9 am: 144934f1fc 
Original change: https://android-review.googlesource.com/c/platform/build/+/1963868

Change-Id: I122e7b631f692e9c5e05948e8fe25a24d4626f5d
 2022-02-02 07:20:35 +00:00
Ramji Jiyani
13a4137929 core & tools: system_dlkm: add dynamic partition 
Converts existing static partition support to a
dynamic partition.

Bug: 200082547
Test: TH
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: Ifd6d0c2a04e947b16f8b241e99cca594a1d315ae
 2022-01-30 08:43:08 +00:00
Treehugger Robot
be522dbbfd Merge "Add a version code and version name to fsverity manifest APK" am: 766c5343e2 am: ff606ad9b6 am: 48e67cefd1 am: bf6c2242c0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1963641

Change-Id: Idc78b8c7553b47d52b08f20225079bc87181ca1f
 2022-01-28 01:11:15 +00:00
Treehugger Robot
766c5343e2 Merge "Add a version code and version name to fsverity manifest APK" 2022-01-27 23:48:24 +00:00
Treehugger Robot
684c7fd0e5 Merge "Fix bug where VABC xor is used on unsupported builds" am: c1edfc3b29 am: ea01d07642 am: e72c026778 am: d6ec917385 
Original change: https://android-review.googlesource.com/c/platform/build/+/1961565

Change-Id: I6ae3bae4ce2e37961e039de50da114b4d54a80e9
 2022-01-27 23:36:35 +00:00
Treehugger Robot
522fb21391 Merge "Skip generating care_map for non-AB updates" am: e3935dd7f0 am: f0dbde9990 am: bbedf706bc am: 78bc0850aa 
Original change: https://android-review.googlesource.com/c/platform/build/+/1963386

Change-Id: I6f5b35dd4292b4e199ca3fcddbeeb5e899491590
 2022-01-27 23:36:17 +00:00
Treehugger Robot
c1edfc3b29 Merge "Fix bug where VABC xor is used on unsupported builds" 2022-01-27 22:30:57 +00:00
Colin Cross
658172d982 Add a version code and version name to fsverity manifest APK 
The post-build signing step expects to find a version code in every
APK, add the version code and version name.

Bug: 216584708
Test: manual
Change-Id: Ic43730df50ef32611d5b4159b46c8bbf9906e009
 2022-01-27 12:46:22 -08:00
Iavor-Valentin Iftime
b837b7170b Skip generating care_map for non-AB updates 
Bug: 186097910
Test: build a non-AB update merged target using Forrest,
      No errors reported and no META/care_map.pb is generated.

Change-Id: I74990b0aa7f46d4c4d40098a4b102f7e04166c39
 2022-01-27 18:35:43 +00:00
Kelvin Zhang
f175801f62 Fix bug where VABC xor is used on unsupported builds 
Test: th
Bug: 216426344
Change-Id: I352136eb5f261ee1ca1567530109e7623c5f978b
 2022-01-27 10:23:10 -08:00
Treehugger Robot
ad2dfe1304 Merge "releasetools: system_dlkm: add image to dist zip" am: ef8f4426ef am: e97ae10d73 am: 537cb49480 am: 0eba8f0757 
Original change: https://android-review.googlesource.com/c/platform/build/+/1958309

Change-Id: I1e3c9f5e896b87ca48deccc4619a352d133db467
 2022-01-25 21:31:20 +00:00
Ramji Jiyani
bdef28f2ee releasetools: system_dlkm: add image to dist zip 
Bug: 200082547
Test: Manual builds:
      1. Set BOARD_USES_SYSTEM_DLKM_PARTITION
      2. Set BOARD_PREBUILT_SYSTEM_DLKM_IMAGE to external image
      - Check that "m dist" put the system_dlkm image in
      out/dist/aosp_cf_x86_64_phone-img-eng.ramjiyani.zip
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I8b7dd40e178db7fe542253bff19040095847fa57
 2022-01-24 21:27:52 +00:00
Treehugger Robot
15423781f6 Merge "Add erofs compressor type param" am: d698e3e0b0 am: 8988b57027 am: 0a697caa2b am: 6d70ba5041 
Original change: https://android-review.googlesource.com/c/platform/build/+/1949257

Change-Id: If9adb8f042daad86245b1a2b900429c37b53cd4d
 2022-01-19 03:37:07 +00:00
Treehugger Robot
b179f9e6cf Merge "Fix formatting error" am: 5d14dfa2fd am: c5f019bf71 am: 286491047d am: c717997920 
Original change: https://android-review.googlesource.com/c/platform/build/+/1952324

Change-Id: I37cc4c3de15bf4a6508b46e72d3e233b068e3e81
 2022-01-19 01:01:00 +00:00
Kelvin Zhang
988f92d7c5 Merge "Fix check_tf failure when duplicate package names are present" am: 4a376986ea am: 6a7d589ed2 am: 68b0980e5b am: 367d28b2c6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1949256

Change-Id: I232a775698ab70b0bf0cddeee9af55cb8af2652e
 2022-01-18 19:31:51 +00:00
Kelvin Zhang
6fe2fc031f Add erofs compressor type param 
Test: th
Bug: 206729162
Change-Id: I3ddd1a55e1544a8a4d24ed445562f05ad0aaad2c
 2022-01-18 10:17:49 -08:00
Kelvin Zhang
554c8bee14 Fix formatting error 
Test: th
Bug: 214388458
Change-Id: I2dc72884aad4f440b4b68566e2e29f9f6f5aa73e
 2022-01-18 10:17:49 -08:00
Kelvin Zhang
4a376986ea Merge "Fix check_tf failure when duplicate package names are present" 2022-01-18 18:14:02 +00:00
Yi-yo Chiang
14d0e73497 Merge changes from topic "gki-avb-vts" am: 8b4e2fd6c0 am: b45caeb134 am: f2c62d7ddb am: e3874400a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941496

Change-Id: I252c986a2e0a15df168a14ac4d31f19f9f0dc19b
 2022-01-17 05:51:06 +00:00
Yi-yo Chiang
8b4e2fd6c0 Merge changes from topic "gki-avb-vts" 
* changes:
  releasetools: Android T GKI certification scheme
  Android T GKI certification scheme
 2022-01-17 04:52:28 +00:00
Yi-Yo Chiang
36054e2daf releasetools: Android T GKI certification scheme 
Companion change of Iaf48a6e3d4b97fa6bfb5e1635a288b045baa248f
To support new GKI certification scheme for boot.img and
init_boot.img on upgrading and launching device combinations.

Bug: 210367929
Bug: 211741246
Bug: 203698939
Test: atest --host releasetools_test:test_common
Test: unpack_bootimg --boot_img boot.img
Test: unpack_bootimg --boot_img init_boot.img
Test: avbtool info_image --image out/boot_signature
Change-Id: I3749297c09c3899046550e4be776acbeea37ef2e
 2022-01-14 19:50:32 +08:00
Treehugger Robot
bd1b5694fd Merge "Add option to enable lz4diff" am: 2f1f985480 am: 3187ce1680 am: b89cd6aad3 am: 8a1662d71c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1944184

Change-Id: I2adfe5357fec0cedf58393b6922d3aa116f472ec
 2022-01-13 21:19:31 +00:00
Kelvin Zhang
67553739e3 Fix check_tf failure when duplicate package names are present 
Test: check_target_files_signatures sdk_gphone64_x86_64-target_files-8069754.zip
Bug: 214388458

Change-Id: I0a8a0d0596c04a9da4283d4d4caeb3bb62762ccc
 2022-01-13 12:30:22 -08:00
Kelvin Zhang
f2728d615e Add option to enable lz4diff 
When lz4diff is enabled, we inject the host copy of liblz4.so in
target_file to delta_generator. This is to ensure that host tooling can
produce same compressed output as the device.

Test: th
Bug: 206729162

Change-Id: I2d8206f7ec54fadedea16bf3d811b8353bc9414d
 2022-01-12 17:21:00 -08:00
Victor Hsieh
9e12870560 Merge "Add min_sdk_version to BuildManifest.apk" am: 70ca7c6add am: 30afe79e30 am: 829fe6d623 am: 271ca249c3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941946

Change-Id: I2c5281988a1bc9c14340d207c71275565eff866a
 2022-01-10 21:17:34 +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