summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-11-02 09:53:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-02 09:53:58 -0700
commitb7fd421077fe5d9a9e5ac19965f041857864cfdb (patch)
tree8640622c614903cef381159418a06f8322053879
parent6a9288c3e8278fa6d665c1c9e61912152549171e (diff)
parent241b668398869e58de8ceb50f87a800741f9e91d (diff)
downloadandroid_device_common-b7fd421077fe5d9a9e5ac19965f041857864cfdb.tar.gz
android_device_common-b7fd421077fe5d9a9e5ac19965f041857864cfdb.tar.bz2
android_device_common-b7fd421077fe5d9a9e5ac19965f041857864cfdb.zip
am 241b6683: xloader is optional, only copy it when it\'s there
* commit '241b668398869e58de8ceb50f87a800741f9e91d': xloader is optional, only copy it when it's there
-rw-r--r--generate-factory-images-common.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh
index 417bc8b..241ecd7 100644
--- a/generate-factory-images-common.sh
+++ b/generate-factory-images-common.sh
@@ -54,7 +54,10 @@ fi
# Copy the various images in their staging location
cp ${SRCPREFIX}$PRODUCT-img-$BUILD.zip tmp/$PRODUCT-$VERSION/image-$PRODUCT-$VERSION.zip
-cp tmp/RADIO/$XLOADERSRC tmp/$PRODUCT-$VERSION/xloader-$DEVICE-$XLOADER.img
+if test "$XLOADER" != ""
+then
+ cp tmp/RADIO/$XLOADERSRC tmp/$PRODUCT-$VERSION/xloader-$DEVICE-$XLOADER.img
+fi
if test "$BOOTLOADERFILE" = ""
then
cp tmp/RADIO/$BOOTLOADERSRC tmp/$PRODUCT-$VERSION/bootloader-$DEVICE-$BOOTLOADER.img