commit f3c660ceb3d7f63c85f61adb96c33b1f3a3bdf73
author Jean-Baptiste Queru <jbq@google.com> Tue Jun 26 11:44:12 2012 -0700
committer Jean-Baptiste Queru <jbq@google.com> Tue Jun 26 11:44:12 2012 -0700
tree 7fea88ebb106b73d66636e168125f5932759aa57
parent a0991ecf777a62f43a8aeca838b85baef97b417f
parent 479368b43cc96ca3387c56304badd30fde219a50

resolved conflicts for merge of 479368b4 to master

Change-Id: Ie000624d9b3f194d47fc506347c4e4ad5b19101b

generate-blob-lists.sh

diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index c397c33..cae5b74 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -42,7 +42,7 @@
 fi
 shift
 
-DEVICES="crespo crespo4g wingray panda maguro grouper"
+DEVICES="crespo crespo4g wingray panda maguro grouper 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 |