Allow the radio to be specified as a standalone file.
This replicates the bootloader setup.
Bug: 4295425
Bug: 7252211
Change-Id: I7f7ff157fab98f67a9e143019870d64fffd5b2f1
diff --git a/clear-factory-images-variables.sh b/clear-factory-images-variables.sh
index df9c251..a92586a 100644
--- a/clear-factory-images-variables.sh
+++ b/clear-factory-images-variables.sh
@@ -24,6 +24,7 @@
unset ERASE
unset PRODUCT
unset RADIO
+unset RADIOFILE
unset RADIOSRC
unset SLEEPDURATION
unset SRCPREFIX
diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh
index 2fc5ebf..3e07e3e 100644
--- a/generate-factory-images-common.sh
+++ b/generate-factory-images-common.sh
@@ -43,7 +43,7 @@
then
unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/$BOOTLOADERSRC
fi
-if test "$RADIO" != ""
+if test "$RADIO" != "" -a "$RADIOFILE" = ""
then
unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/$RADIOSRC
fi
@@ -66,7 +66,12 @@
fi
if test "$RADIO" != ""
then
- cp tmp/RADIO/$RADIOSRC tmp/$PRODUCT-$VERSION/radio-$DEVICE-$RADIO.img
+ if test "$RADIOFILE" = ""
+ then
+ cp tmp/RADIO/$RADIOSRC tmp/$PRODUCT-$VERSION/radio-$DEVICE-$RADIO.img
+ else
+ cp $RADIOFILE tmp/$PRODUCT-$VERSION/radio-$DEVICE-$RADIO.img
+ fi
fi
if test "$CDMARADIO" != ""
then
