commit 946907b1dbb4a19dbd027c6955f036613f74af9d
author Ed Heyl <ed@google.com> Thu Jul 26 13:59:51 2012 -0700
committer Ed Heyl <ed@google.com> Thu Jul 26 13:59:51 2012 -0700
tree cf172c9815c5bb5a7e5ffb0e4f9b1dcbd500b83c
parent 1db6a294ad4e5f10fffdf80ab5a1255b718108a6
parent 35038d786749a44bef8991f052675baea5be28e6

fix conflicts with merge of jb-dev-mako

Change-Id: I424e1fef73e3225e5b495b5974a3c9416be5797c

clear-factory-images-variables.sh

diff --git a/clear-factory-images-variables.sh b/clear-factory-images-variables.sh
index 312f195..e0c6758 100644
--- a/clear-factory-images-variables.sh
+++ b/clear-factory-images-variables.sh
@@ -17,8 +17,11 @@
 unset BOOTLOADERSRC
 unset BUILD
 unset CDMARADIO
+unset DEVICE
+unset ERASE
 unset PRODUCT
 unset RADIO
 unset RADIOSRC
+unset SLEEPDURATION
 unset SRCPREFIX
 unset VERSION

generate-blob-lists.sh

diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index a185d18..940e0a3 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -42,7 +42,7 @@
 fi
 shift
 
-DEVICES="crespo crespo4g wingray panda maguro toro grouper mako"
+DEVICES="crespo crespo4g wingray panda maguro toro grouper mako manta"
 export LC_ALL=C
 
 repo sync -j32 -n
@@ -60,16 +60,6 @@
   for DEVICENAME in $DEVICES
   do
     rm -rf out
-    if test $DEVICENAME = maguro
-    then
-      lunch yakju-user
-      make -j32 libdrmdecrypt
-    fi
-    if test $DEVICENAME = toro
-    then
-      lunch mysid-user
-      make -j32 libdrmdecrypt
-    fi
     lunch full_$DEVICENAME-user
     make -j32
     cat out/target/product/$DEVICENAME/installed-files.txt |
@@ -124,7 +114,7 @@
       if test "$1" != "" -a "$2" != ""
       then
         echo uploading to server $1 branch $2
-        git push ssh://$1:29418/device/$MANUFACTURERNAME/$DEVICENAME.git HEAD:refs/for/$2/autoblobs
+        git push $1/device/$MANUFACTURERNAME/$DEVICENAME.git HEAD:refs/for/$2/autoblobs
       fi
     )
   else
@@ -134,7 +124,7 @@
       if test "$1" != "" -a "$2" != ""
       then
         echo uploading to server $1 branch $2
-        git push ssh://$1:29418/device/$MANUFACTURERNAME/$DEVICENAME.git HEAD:refs/for/$2/autoblobs
+        git push $1/device/$MANUFACTURERNAME/$DEVICENAME.git HEAD:refs/for/$2/autoblobs
       fi
     )
   fi

generate-factory-images-common.sh

diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh
index 5d06a09..a82e3d2 100644
--- a/generate-factory-images-common.sh
+++ b/generate-factory-images-common.sh
@@ -70,6 +70,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+EOF
+if test "$ERASEALL" = "true"
+then
+cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
+fastboot erase boot
+fastboot erase cache
+fastboot erase recovery
+fastboot erase system
+fastboot erase userdata
+EOF
+fi
+cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
 fastboot flash bootloader bootloader-$DEVICE-$BOOTLOADER.img
 fastboot reboot-bootloader
 sleep $SLEEPDURATION