am c761eeaa: (-s ours) am 51f84bac: Only build phantasm in this branch - do not merge
* commit 'c761eeaa8a2a6d872c54d7674d6f3be1504be4bb':
Only build phantasm in this branch - do not merge
diff --git a/clear-factory-images-variables.sh b/clear-factory-images-variables.sh
index a92586a..bae0abb 100644
--- a/clear-factory-images-variables.sh
+++ b/clear-factory-images-variables.sh
@@ -20,12 +20,14 @@
unset TWINBOOTLOADERS
unset BUILD
unset CDMARADIO
+unset CDMARADIOFILE
unset DEVICE
unset ERASE
unset PRODUCT
unset RADIO
unset RADIOFILE
unset RADIOSRC
+unset RADIOFILE
unset SLEEPDURATION
unset SRCPREFIX
unset VERSION
diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index fdfba35..bc848df 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -42,7 +42,7 @@
fi
shift
-DEVICES="phantasm"
+DEVICES="maguro toro toroplus grouper manta mako"
export LC_ALL=C
repo sync -j32 -n
@@ -66,9 +66,6 @@
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 3e07e3e..241ecd7 100644
--- a/generate-factory-images-common.sh
+++ b/generate-factory-images-common.sh
@@ -47,7 +47,7 @@
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
@@ -75,14 +75,19 @@
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.
@@ -223,7 +228,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.
