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

Merge "build_mixed: removed product.img if system_dir does not have one."

Browse Source
This commit is contained in:
Treehugger Robot
2019-01-04 08:43:55 +00:00
committed by Gerrit Code Review
parent 70c887a441 74b00cb5f7
commit f6bdd28a3f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vndk/tools/build_mixed
View File

@@ -19,6 +19,8 @@ usage () {
echo " to override the existing vbmeta.img of device. Optional." echo " to override the existing vbmeta.img of device. Optional."
echo "-s is used to fetch and flash both product.img and system.img from" echo "-s is used to fetch and flash both product.img and system.img from"
echo " the system_build_dir for devices with a product partition." echo " the system_build_dir for devices with a product partition."
echo " product.img will be removed if system_build_dir does not have"
echo " product.img when -s option is declared."
echo " By default, only system.img is flashed to the target device for" echo " By default, only system.img is flashed to the target device for"
echo " independent system update. No parameter required. Optional" echo " independent system update. No parameter required. Optional"
echo "system_build_dir is the path to the system build" echo "system_build_dir is the path to the system build"
@@ -134,6 +136,7 @@ EXTRACT_FILE_LIST=(
) )
if [[ "$INCLUDE_PRODUCT" == true ]]; then if [[ "$INCLUDE_PRODUCT" == true ]]; then
unzip -l "$SYSTEM_TARGET_FILES_ARCHIVE" | grep -q IMAGES/product.img &&
EXTRACT_FILE_LIST+=(IMAGES/product.img) EXTRACT_FILE_LIST+=(IMAGES/product.img)
fi fi
@@ -200,7 +203,13 @@ fi
# Overwrite artifacts in the device archive to create the Mixed Build artifacts. # Overwrite artifacts in the device archive to create the Mixed Build artifacts.
cp "$SYSTEM_IMAGES_DIR"/system.img "$DEVICE_IMAGES_DIR"/ cp "$SYSTEM_IMAGES_DIR"/system.img "$DEVICE_IMAGES_DIR"/
if [[ "$INCLUDE_PRODUCT" == true ]]; then if [[ "$INCLUDE_PRODUCT" == true ]]; then
cp "$SYSTEM_IMAGES_DIR"/product.img "$DEVICE_IMAGES_DIR"/ if [[ -f "$SYSTEM_IMAGES_DIR"/product.img ]]; then
cp "$SYSTEM_IMAGES_DIR"/product.img "$DEVICE_IMAGES_DIR"/
else
rm -f "$DEVICE_IMAGES_DIR"/product.img
# Removed product partition from required partition list
sed -i "/partition-exists=product$/d" "$DEVICE_IMAGES_DIR"/android-info.txt
fi
fi fi
# Only override vbmeta if it is already present since fastboot update will try # Only override vbmeta if it is already present since fastboot update will try