diff options
| author | Logan Chien <loganchien@google.com> | 2018-05-09 11:08:23 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2018-05-21 10:20:25 +0800 |
| commit | 8a273728b695257f43a2ddcaa72d4920561bea8a (patch) | |
| tree | 0c45c85dfa55759491d0c2e4bb68ac945f020fe7 | |
| parent | 4ea0a82057635b2669995c147b6c3f03dede3dea (diff) | |
| download | framework-android-vts-9.0_r9.tar.gz | |
change-spl: Detect image format before simg2imgandroid-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-vts-releasepie-vts-devpie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
This commit reads the sparse image magic word before calling simg2img
so that `change_security_patch_var.sh` can support both sparse and
unsparse system images.
Bug: 79395599
Test: ./change_security_patch_ver.sh with the latest aosp_arm64 image
Change-Id: I207195fa9a3922aa24cca7317dbfc0aaf2f64a36
Merged-In: I207195fa9a3922aa24cca7317dbfc0aaf2f64a36
| -rwxr-xr-x | harnesses/host_controller/gsi/change_security_patch_ver.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/harnesses/host_controller/gsi/change_security_patch_ver.sh b/harnesses/host_controller/gsi/change_security_patch_ver.sh index 563f836..c99ec03 100755 --- a/harnesses/host_controller/gsi/change_security_patch_ver.sh +++ b/harnesses/host_controller/gsi/change_security_patch_ver.sh @@ -121,15 +121,22 @@ if [ ! -d "${BIN_PATH}" ] || [ ! -f "${BIN_PATH}/simg2img" ]; then exit 1 fi -UNSPARSED_SYSTEM_IMG="${SYSTEM_IMG}.raw" MOUNT_POINT="${PWD}/temp_mnt" SPL_PROPERTY_NAME="ro.build.version.security_patch" RELEASE_VERSION_PROPERTY_NAME="ro.build.version.release" VNDK_VERSION_PROPERTY="ro.vndk.version" VNDK_VERSION_PROPERTY_OMR1="${VNDK_VERSION_PROPERTY}=27" -echo "Unsparsing ${SYSTEM_IMG}..." -$BIN_PATH/simg2img "$SYSTEM_IMG" "$UNSPARSED_SYSTEM_IMG" +UNSPARSED_SYSTEM_IMG="${SYSTEM_IMG}.raw" +SYSTEM_IMG_MAGIC="$(xxd -g 4 -l 4 "$SYSTEM_IMG" | head -n1 | awk '{print $2}')" +if [ "$SYSTEM_IMG_MAGIC" = "3aff26ed" ]; then + echo "Unsparsing ${SYSTEM_IMG}..." + $BIN_PATH/simg2img "$SYSTEM_IMG" "$UNSPARSED_SYSTEM_IMG" +else + echo "Copying unsparse input system image ${SYSTEM_IMG}..." + cp "$SYSTEM_IMG" "$UNSPARSED_SYSTEM_IMG" +fi + IMG_SIZE=$(stat -c%s "$UNSPARSED_SYSTEM_IMG") echo "Mounting..." |