Add argument for skipping radio.img
Some targets are missing radio.img, eg. Android TV
=> this script fails when trying to copy radio.img.
Bug: 186097910
Change-Id: I92c13e299ca481cad5b5ff41451102937ad4368b
Test: tools/treble/vf/merge.sh .... -r false"
diff --git a/vf/merge.sh b/vf/merge.sh
index 20ceb6b..372bb0e 100755
--- a/vf/merge.sh
+++ b/vf/merge.sh
@@ -5,7 +5,7 @@
set -e
-while getopts ":t:d:v:b:m:" option ; do
+while getopts ":t:d:v:b:m:r:" option ; do
case "${option}" in
t) TARGET=${OPTARG} ;;
d) DIST_DIR=${OPTARG} ;;
@@ -13,6 +13,7 @@
b) BUILD_ID=${OPTARG} ;;
# TODO(b/170638547) Remove the need for merge configs.
m) MERGE_CONFIG_DIR=${OPTARG} ;;
+ r) HAS_RADIO_IMG=${OPTARG} ;;
*) echo "Unexpected argument: -${OPTARG}" >&2 ;;
esac
done
@@ -37,6 +38,9 @@
echo "error: -m merge config dir argument not set"
exit 1
fi
+if [[ -z "${HAS_RADIO_IMG}" ]]; then
+ HAS_RADIO_IMG="true"
+fi
# Move the system-only build artifacts to a separate folder
# so that the flashing tools use the merged files instead.
@@ -61,7 +65,11 @@
# Copy bootloader.img, radio.img, and android-info.txt, needed for flashing.
cp ${VENDOR_DIR}/bootloader.img ${DIST_DIR}/bootloader.img
-cp ${VENDOR_DIR}/radio.img ${DIST_DIR}/radio.img
+# Copy radio.img unless arg is "false" (eg. Android TV targets)
+if [[ $HAS_RADIO_IMG = "true" ]]; then
+ cp ${VENDOR_DIR}/radio.img ${DIST_DIR}/radio.img
+fi
+
unzip -j -d ${DIST_DIR} \
${VENDOR_DIR}/*-target_files-*.zip \
OTA/android-info.txt
