Don't consider odex files.

Also, finish cleaning up the NFC special-cases.

Change-Id: I153fdd42db4e86579f114d482c720547825d3989

diff --git a/generate-blob-scripts.sh b/generate-blob-scripts.sh
index e03924b..cb5443c 100755 (executable)
--- a/generate-blob-scripts.sh
+++ b/generate-blob-scripts.sh
@@ -103,6 +103,7 @@ do
     echo 'mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE/proprietary'
 
     diff $ARCHIVEDIR/$DEVICENAME-without.txt $ARCHIVEDIR/$DEVICENAME-with.txt |
+      grep -v '\.odex$' |
       grep '>' |
       cut -b 3- |
       while read FULLPATH
@@ -143,6 +144,7 @@ do
 
     FOUND=false
     diff $ARCHIVEDIR/$DEVICENAME-without.txt $ARCHIVEDIR/$DEVICENAME-with.txt |
+      grep -v '\.odex$' |
       grep '>' |
       cut -b 3- |
       while read FULLPATH
@@ -165,10 +167,7 @@ do
 
     FOUND=false
     diff $ARCHIVEDIR/$DEVICENAME-without.txt $ARCHIVEDIR/$DEVICENAME-with.txt |
-      grep -v Nfc\.apk\$ |
-      grep -v Tag\.apk\$ |
-      grep -v libnfc\.so\$ |
-      grep -v libnfc_jni\.so\$ |
+      grep -v '\.odex$' |
       grep '>' |
       cut -b 3- |
       while read FULLPATH