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

Merge "Fix syntax error after adding -d" am: e27e2c5448

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1376576

Change-Id: I0a168b4c1fa26c4e8b9f0375a5471fdd5704afb1
This commit is contained in:
Treehugger Robot
2020-07-29 20:38:48 +00:00
committed by Automerger Merge Worker
parent 53bb55f7f5 e27e2c5448
commit 505f0a0ede
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
if [[ "$SKIP_VBMETA_REPLACE" == true ]]; then
# Totally skip the vbmeta.img replacement
# Totally skip the vbmeta.img replacement
echo "Skip vbmeta.img replacement."
else
# 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
readonly VBMETA_IMAGE_PATH="${OVERRIDE_VBMETA_IMAGE_PATH:-"$SYSTEM_IMAGES_DIR"/vbmeta.img}"
cp "$VBMETA_IMAGE_PATH" "$DEVICE_IMAGES_DIR"/
readonly VBMETA_IMAGE_PATH="${OVERRIDE_VBMETA_IMAGE_PATH:-"$SYSTEM_IMAGES_DIR"/vbmeta.img}"
cp "$VBMETA_IMAGE_PATH" "$DEVICE_IMAGES_DIR"/
fi
fi