summaryrefslogtreecommitdiffstats
path: root/generate-factory-images-common.sh
diff options
context:
space:
mode:
Diffstat (limited to 'generate-factory-images-common.sh')
-rw-r--r--generate-factory-images-common.sh22
1 files changed, 16 insertions, 6 deletions
diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh
index 32c4a00..f89bd6f 100644
--- a/generate-factory-images-common.sh
+++ b/generate-factory-images-common.sh
@@ -43,11 +43,11 @@ if test "$BOOTLOADERFILE" = ""
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
-if test "$CDMARADIO" != ""
+if test "$CDMARADIO" != "" -a "$CDMARADIOFILE" = ""
then
unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/radio-cdma.img
fi
@@ -63,18 +63,28 @@ else
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
- cp tmp/RADIO/radio-cdma.img tmp/$PRODUCT-$VERSION/radio-cdma-$DEVICE-$CDMARADIO.img
+ if test "$CDMARADIOFILE" = ""
+ then
+ cp tmp/RADIO/radio-cdma.img tmp/$PRODUCT-$VERSION/radio-cdma-$DEVICE-$CDMARADIO.img
+ else
+ cp $CDMARADIOFILE tmp/$PRODUCT-$VERSION/radio-cdma-$DEVICE-$CDMARADIO.img
+ fi
fi
# Write flash-all.sh
cat > tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
#!/bin/sh
-# Copyright 2011 The Android Open Source Project
+# Copyright 2012 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -199,7 +209,7 @@ EOF
cat > tmp/$PRODUCT-$VERSION/flash-base.sh << EOF
#!/bin/sh
-# Copyright 2011 The Android Open Source Project
+# Copyright 2012 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.