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

Merge "Fix syntax error after adding -d"

Browse Source
This commit is contained in:
Treehugger Robot
2020-07-29 20:18:12 +00:00
committed by Gerrit Code Review
parent 40575a5424 d85d458c0b
commit e27e2c5448
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vndk/tools/build_mixed
View File

@@ -285,13 +285,14 @@ if [[ "$INCLUDE_PRODUCT" == true ]]; then
fi fi
if [[ "$SKIP_VBMETA_REPLACE" == true ]]; then if [[ "$SKIP_VBMETA_REPLACE" == true ]]; then
# Totally skip the vbmeta.img replacement # Totally skip the vbmeta.img replacement
echo "Skip vbmeta.img replacement."
else else
# 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
# to flash whatever is in the archive. # to flash whatever is in the archive.
if [[ -f "$DEVICE_IMAGES_DIR"/vbmeta.img ]]; then if [[ -f "$DEVICE_IMAGES_DIR"/vbmeta.img ]]; then
readonly VBMETA_IMAGE_PATH="${OVERRIDE_VBMETA_IMAGE_PATH:-"$SYSTEM_IMAGES_DIR"/vbmeta.img}" readonly VBMETA_IMAGE_PATH="${OVERRIDE_VBMETA_IMAGE_PATH:-"$SYSTEM_IMAGES_DIR"/vbmeta.img}"
cp "$VBMETA_IMAGE_PATH" "$DEVICE_IMAGES_DIR"/ cp "$VBMETA_IMAGE_PATH" "$DEVICE_IMAGES_DIR"/
fi fi
fi fi