resolved conflicts for merge of 5f6a33da to master
Change-Id: I4803edf72913ada72bddb63f247b77e271f17baa
diff --git a/clear-factory-images-variables.sh b/clear-factory-images-variables.sh
index e0c6758..50c438f 100644
--- a/clear-factory-images-variables.sh
+++ b/clear-factory-images-variables.sh
@@ -17,11 +17,13 @@
unset BOOTLOADERSRC
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 0347117..bf4dcba 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -73,7 +73,6 @@
rm -rf device/samsung/crespo*
rm -rf device/samsung/torospr
rm -rf external/bluetooth/bluedroid
- rm -rf external/eigen
rm -rf external/libnfc-nci
rm -rf hardware/broadcom/nfc
rm -rf hardware/msm7k
@@ -83,7 +82,6 @@
rm -rf packages/apps/Camera
rm -rf packages/apps/Gallery2
rm -rf packages/apps/Nfc
- rm -rf packages/apps/PhoneCommon
rm -rf vendor
for DEVICENAME in $DEVICES
do
diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh
index d6674bc..c811bb6 100644
--- a/generate-factory-images-common.sh
+++ b/generate-factory-images-common.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 The Android Open Source Project
+# Copyright 2011 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.
@@ -26,11 +26,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
@@ -43,11 +43,21 @@
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
if test "$SLEEPDURATION" = ""
then
@@ -56,7 +66,7 @@
cat > tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
#!/bin/sh
-# Copyright (C) 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.
@@ -165,7 +175,7 @@
cat > tmp/$PRODUCT-$VERSION/flash-base.sh << EOF
#!/bin/sh
-# Copyright (C) 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.
