am 163df02e: (-s ours) Reconcile with jb-mr1-factory-release - do not merge
* commit '163df02e120b3ac7b9ebc0d1ffce7e50642ee49c':
Add support of getting factory BDADDR from Controller's non-volatile memory(2/2)
diff --git a/clear-factory-images-variables.sh b/clear-factory-images-variables.sh
index df9c251..aa41e7c 100644
--- a/clear-factory-images-variables.sh
+++ b/clear-factory-images-variables.sh
@@ -20,11 +20,13 @@
unset TWINBOOTLOADERS
unset BUILD
unset CDMARADIO
+unset CDMARADIOFILE
unset DEVICE
unset ERASE
unset PRODUCT
unset RADIO
unset RADIOSRC
+unset RADIOFILE
unset SLEEPDURATION
unset SRCPREFIX
unset VERSION
diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index 0f34ad3..206e012 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -66,9 +66,7 @@
cut -b 15- |
sort -f > $ARCHIVEDIR/$DEVICENAME-with.txt
done
- rm -rf device/asus/tilapia
rm -rf hardware/broadcom/nfc
- rm -rf packages/apps/UnifiedEmail
rm -rf vendor
for DEVICENAME in $DEVICES
do
diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh
index 0ff6868..417bc8b 100644
--- a/generate-factory-images-common.sh
+++ b/generate-factory-images-common.sh
@@ -43,11 +43,11 @@
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 @@
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.
@@ -215,7 +225,7 @@
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.
