LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow specifying null vbmeta.img for production system.img

Browse Source 
For a system image that is not a GSI but built for a specific
product (e.g. Pixel 2 system image), in order to be
flashed on a device of an older Android version, the vbmeta.img
must be replaced by a null vbmeta.img built by avbtool.

Bug: 78215452
Test: development/vndk/tools/build_mixed -v 8.1.0
-m development/vndk/tools/modify_system_img.sh
-p <null_vbmeta_image_path> gsi_build_dir device_build_dir out_dir
<check_tool>

Change-Id: I5bc9f541f177205d548a0e2e97eb169686567bd5
This commit is contained in:
Jae Shin
2018-06-04 16:55:26 +09:00
parent 36f6f66a0e
commit e4a6d70f47
1 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
vndk/tools/build_mixed
View File

@@ -1,18 +1,20 @@
#!/bin/bash -ex
usage () {
echo "Create a Mixed Build archive with the given GSI and device archives."
echo "Create a Mixed Build archive with the given system and device archives."
echo
echo "Usage: $0 [-v <vendor_version>] [-m <modify_system_image_path>] "
echo " gsi_build_dir device_build_dir out_dir [check_tool]"
echo "Usage: $0 [-v <vendor_version>] [-m <modify_system_image_path>] [-p <override_vbmeta_image_path>]"
echo " system_build_dir device_build_dir out_dir [check_tool]"
echo
echo "Options -v and -m must precede positional arguments."
echo "Options -v, -m, -p must precede positional arguments."
echo
echo "vendor_version is the version of the vendor image when the mixed"
echo " build is inter branch. Optional."
echo " eg. 8.1.0 for a mixed build of GSI and O-MR1 vendor image."
echo "modify_system_image_path is the path to the script that modifies the"
echo " system image for an inter branch build target. Optional."
echo "gsi_build_dir is the path to the GSI build"
echo "override_vbmeta_image_path is the path to a vbmeta.img to use"
echo " to override the existing vbmeta.img of device. Optional."
echo "system_build_dir is the path to the system build"
echo " eg. aosp_arm64_ab-userdebug."
echo "device_build_dir is the path to the device build"
echo " eg. sailfish-user."
@@ -39,7 +41,7 @@ cleanup_and_exit () {
trap cleanup_and_exit EXIT
while getopts :v:m: opt; do
while getopts :v:m:p: opt; do
case "$opt" in
v)
readonly VENDOR_VERSION="$OPTARG"
@@ -47,6 +49,9 @@ while getopts :v:m: opt; do
m)
readonly MODIFY_SYSTEM_SCRIPT="$OPTARG"
;;
p)
readonly OVERRIDE_VBMETA_IMAGE_PATH="$OPTARG"
;;
\?)
exit_badparam "Invalid options: -"$OPTARG""
;;
@@ -56,7 +61,7 @@ while getopts :v:m: opt; do
esac
done
if [[ "$OPTIND" -gt 1 && "$OPTIND" -lt 5 ]]; then
if [[ -z "${VENDOR_VERSION+x}" && ! -z "${MODIFY_SYSTEM_SCRIPT+x}" ]] || [[ ! -z "${VENDOR_VERSION+x}" && -z "${MODIFY_SYSTEM_SCRIPT+x}" ]]; then
exit_badparam "Options -v and -m must be set together."
fi
@@ -66,19 +71,23 @@ if [[ ! -z "${MODIFY_SYSTEM_SCRIPT+x}" && ! -f "$MODIFY_SYSTEM_SCRIPT" ]]; then
exit_badparam "Script not found: "$MODIFY_SYSTEM_SCRIPT""
fi
if [[ ! -z "${OVERRIDE_VBMETA_IMAGE_PATH+x}" && ! -f "$OVERRIDE_VBMETA_IMAGE_PATH" ]]; then
exit_badparam "Specified vbmeta.img not found: "$OVERRIDE_VBMETA_IMAGE_PATH""
fi
if [[ $# -lt 3 ]]; then
exit_badparam "Unexpected number of arguments"
fi
readonly GSI_DIR="$1"
readonly SYSTEM_DIR="$1"
readonly DEVICE_DIR="$2"
readonly DIST_DIR="$3"
readonly CHECK_TOOL="$4"
readonly TEMP_DIR="$(mktemp -d /tmp/"$(basename $0)"_XXXXXXXX)"
readonly GSI_TARGET_FILES_ARCHIVE="$(find "$GSI_DIR" -name "*-target_files-*.zip" -print)"
if [[ ! -f "$GSI_TARGET_FILES_ARCHIVE" ]]; then
exit_badparam "Could not find GSI target_files archive in $GSI_DIR."
readonly SYSTEM_TARGET_FILES_ARCHIVE="$(find "$SYSTEM_DIR" -name "*-target_files-*.zip" -print)"
if [[ ! -f "$SYSTEM_TARGET_FILES_ARCHIVE" ]]; then
exit_badparam "Could not find system target files archive in $SYSTEM_DIR."
fi
readonly DEVICE_ARCHIVE="$(find "$DEVICE_DIR" -name "*-img-*.zip" -print)"
@@ -93,19 +102,19 @@ fi
readonly DEVICE_ARTIFACTS_DIR="$TEMP_DIR"/device_archive_artifacts
readonly DEVICE_IMAGES_DIR="$DEVICE_ARTIFACTS_DIR"/IMAGES
readonly GSI_ARTIFACTS_DIR="$TEMP_DIR"/gsi_artifacts
readonly GSI_IMAGES_DIR="$GSI_ARTIFACTS_DIR"/IMAGES
readonly SYSTEM_ARTIFACTS_DIR="$TEMP_DIR"/system_artifacts
readonly SYSTEM_IMAGES_DIR="$SYSTEM_ARTIFACTS_DIR"/IMAGES
readonly SPL_PROPERTY_NAME="ro.build.version.security_patch"
readonly SYSTEM_BUILD_PROP="SYSTEM/build.prop"
###
# Uncompress the archives.
mkdir -p "$GSI_ARTIFACTS_DIR"
# Get the GSI images and meta data.
unzip "$GSI_TARGET_FILES_ARCHIVE" \
mkdir -p "$SYSTEM_ARTIFACTS_DIR"
# Get the system images and meta data.
unzip "$SYSTEM_TARGET_FILES_ARCHIVE" \
IMAGES/system.img IMAGES/vbmeta.img META/system_matrix.xml META/system_manifest.xml "$SYSTEM_BUILD_PROP" \
-d "$GSI_ARTIFACTS_DIR"
-d "$SYSTEM_ARTIFACTS_DIR"
mkdir -p "$DEVICE_IMAGES_DIR"
# Get the device images.
@@ -116,30 +125,30 @@ unzip "$DEVICE_TARGET_FILES_ARCHIVE" \
-d "$DEVICE_ARTIFACTS_DIR"
###
# Check compatibility between the GSI compatibility vs the device.
# Check compatibility between the system and device.
if [[ -f "$CHECK_TOOL" ]]; then
"$CHECK_TOOL" \
"$DEVICE_ARTIFACTS_DIR"/META/vendor_manifest.xml \
"$GSI_ARTIFACTS_DIR"/META/system_matrix.xml
"$SYSTEM_ARTIFACTS_DIR"/META/system_matrix.xml
"$CHECK_TOOL" \
"$GSI_ARTIFACTS_DIR"/META/system_manifest.xml \
"$SYSTEM_ARTIFACTS_DIR"/META/system_manifest.xml \
"$DEVICE_ARTIFACTS_DIR"/META/vendor_matrix.xml
fi
###
# Modify system.img if vendor version is provided.
if [[ ! -z "${VENDOR_VERSION+x}" ]]; then
# Create copy of GSI target files package that can be modified
# since the original $GSI_TARGET_FILES_ARCHIVE is a symlink to
# Create copy of system target files package that can be modified
# since the original $SYSTEM_TARGET_FILES_ARCHIVE is a symlink to
# prebuilt files in cache
cp "$GSI_TARGET_FILES_ARCHIVE" "$TEMP_DIR"
readonly COPY_GSI_TARGET_FILES_ARCHIVE="$TEMP_DIR"/"$(basename "$GSI_TARGET_FILES_ARCHIVE")"
cp "$SYSTEM_TARGET_FILES_ARCHIVE" "$TEMP_DIR"
readonly COPY_SYSTEM_TARGET_FILES_ARCHIVE="$TEMP_DIR"/"$(basename "$SYSTEM_TARGET_FILES_ARCHIVE")"
# Check compatibility of security patch level
readonly SYSTEM_SPL=$(sed -n -r "s/^"$SPL_PROPERTY_NAME"=(.*)$/\1/p" "$GSI_ARTIFACTS_DIR"/"$SYSTEM_BUILD_PROP")
readonly SYSTEM_SPL=$(sed -n -r "s/^"$SPL_PROPERTY_NAME"=(.*)$/\1/p" "$SYSTEM_ARTIFACTS_DIR"/"$SYSTEM_BUILD_PROP")
readonly VENDOR_SPL=$(sed -n -r "s/^"$SPL_PROPERTY_NAME"=(.*)$/\1/p" "$DEVICE_ARTIFACTS_DIR"/"$SYSTEM_BUILD_PROP")
declare -a args
args=(-v "$VENDOR_VERSION" "$COPY_GSI_TARGET_FILES_ARCHIVE")
args=(-v "$VENDOR_VERSION" "$COPY_SYSTEM_TARGET_FILES_ARCHIVE")
if [[ "$SYSTEM_SPL" != "$VENDOR_SPL" ]]; then
echo "Security patch level mismatch detected..."
echo " SPL of system: "$SYSTEM_SPL""
@@ -148,17 +157,18 @@ if [[ ! -z "${VENDOR_VERSION+x}" ]]; then
fi
"$MODIFY_SYSTEM_SCRIPT" "${args[@]}"
# Replace system.img with newly modified system.img
unzip -o "$COPY_GSI_TARGET_FILES_ARCHIVE" IMAGES/system.img -d "$GSI_ARTIFACTS_DIR"
unzip -o "$COPY_SYSTEM_TARGET_FILES_ARCHIVE" IMAGES/system.img -d "$SYSTEM_ARTIFACTS_DIR"
fi
###
# Overwrite artifacts in the device archive to create the Mixed Build artifacts.
cp "$GSI_IMAGES_DIR"/system.img "$DEVICE_IMAGES_DIR"/
cp "$SYSTEM_IMAGES_DIR"/system.img "$DEVICE_IMAGES_DIR"/
# Only override vbmeta if it is already present since fastboot update will try
# to flash whatever is in the archive.
if [[ -f "$DEVICE_IMAGES_DIR"/vbmeta.img ]]; then
cp "$GSI_IMAGES_DIR"/vbmeta.img "$DEVICE_IMAGES_DIR"/
readonly VBMETA_IMAGE_PATH="${OVERRIDE_VBMETA_IMAGE_PATH:-"$SYSTEM_IMAGES_DIR"/vbmeta.img}"
cp "$VBMETA_IMAGE_PATH" "$DEVICE_IMAGES_DIR"/
fi
###