commit b7fd421077fe5d9a9e5ac19965f041857864cfdb
author Jean-Baptiste Queru <jbq@google.com> Fri Nov 02 09:53:58 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 02 09:53:58 2012 -0700
tree 8640622c614903cef381159418a06f8322053879
parent 6a9288c3e8278fa6d665c1c9e61912152549171e
parent 241b668398869e58de8ceb50f87a800741f9e91d

am 241b6683: xloader is optional, only copy it when it\'s there

* commit '241b668398869e58de8ceb50f87a800741f9e91d':
  xloader is optional, only copy it when it's there

generate-factory-images-common.sh

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 @@
 
 # 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