commit bb09560e3caddb9639e41a34b427679bccc60b98
author The Android Automerger <android-build@android.com> Mon Jul 30 09:46:12 2012 -0700
committer The Android Automerger <android-build@android.com> Mon Jul 30 09:46:12 2012 -0700
tree d1ce24ebbae43135050c8da07a284df66f393ab1
parent 815d1fc6bd273236aa870ec00dad851febd6f504
parent 5b1dd9e905f822f710a21219da73d1f8e41c3ed8

merge in jb-mr1-release history after reset to jb-mr1-dev

tools/genfiles/genfiles.sh

diff --git a/tools/genfiles/genfiles.sh b/tools/genfiles/genfiles.sh
index ebf995d..32d2352 100755
--- a/tools/genfiles/genfiles.sh
+++ b/tools/genfiles/genfiles.sh
@@ -64,10 +64,6 @@
     then
         # png
         echo "cat /storage/sdcard0/proto.png > \"$data\"" >> $CPFILES
-    elif [ "$format" == "14340" ]
-    then
-        # bmp
-        echo "cat /storage/sdcard0/proto.bmp > \"$data\"" >> $CPFILES
     elif [ "$format" == "14343" -a "$mediatype" == "0" ]
     then
         # gif
@@ -104,15 +100,7 @@
     then
         # 3gp
         echo "cat /storage/sdcard0/proto.3gp > \"$data\"" >> $CPFILES
-    elif [ "$format" == "47747" ]
-    then
-        # doc
-        echo "cat /storage/sdcard0/proto.doc > \"$data\"" >> $CPFILES
-    elif [ "$format" == "47749" ]
-    then
-        # xls
-        echo "cat /storage/sdcard0/proto.xls > \"$data\"" >> $CPFILES
-    elif [ "$format" == "47362" ]
+    elif [ "$format" == "47362" -a "$mediatype" == "2" ]
     then
         # ogg
         echo "cat /storage/sdcard0/proto.ogg > \"$data\"" >> $CPFILES
@@ -120,10 +108,6 @@
     then
         # unknown type
         echo "cat /storage/sdcard0/proto.dat > \"$data\"" >> $CPFILES
-    elif [ "$format" == "12288" -a "$mediatype" == "1" ]
-    then
-        # some kind of image file
-        echo "cat /storage/sdcard0/proto.jpg > \"$data\"" >> $CPFILES
     elif [ "$format" == "12289" -a "$mediatype" == "0" ]
     then
         # directory, ignore
@@ -135,7 +119,7 @@
     else
         echo ignored: $format '|' $mediatype '|' $mimetype '|' $data
     fi
-    echo mkdir -p \"$(dirname "$data")\" >> $MKDIRS
+    echo mkdir -p \"$(dirname $data)\" >> $MKDIRS
 done
 
 sort -u $MKDIRS > mkfiles.sh

tools/genfiles/protos/proto.bmp

diff --git a/tools/genfiles/protos/proto.bmp b/tools/genfiles/protos/proto.bmp
deleted file mode 100644
index a430175..0000000
--- a/tools/genfiles/protos/proto.bmp
+++ /dev/null
Binary files differ

tools/genfiles/protos/proto.doc

diff --git a/tools/genfiles/protos/proto.doc b/tools/genfiles/protos/proto.doc
deleted file mode 100644
index 7387300..0000000
--- a/tools/genfiles/protos/proto.doc
+++ /dev/null
Binary files differ

tools/genfiles/protos/proto.xls

diff --git a/tools/genfiles/protos/proto.xls b/tools/genfiles/protos/proto.xls
deleted file mode 100644
index 11caec9..0000000
--- a/tools/genfiles/protos/proto.xls
+++ /dev/null
Binary files differ