Remove duplicates from Chris Renshaw

diff --git a/magic/Magdir/android b/magic/Magdir/android
index 1d95f66f421a56530b07aad0259ebf30d215a595..0fcb3a0a018406c6590d39730033e63fcea269d7 100644 (file)
--- a/magic/Magdir/android
+++ b/magic/Magdir/android
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------
-# $File: android,v 1.5 2014/06/16 16:56:57 christos Exp $
+# $File: android,v 1.6 2014/08/04 06:00:36 christos Exp $
 # Various android related magic entries
 #------------------------------------------------------------
 
@@ -15,54 +15,11 @@
 >0     regex   dey\n[0-9]{2}\0 Dalvik dex file (optimized for host)
 >4     string  >000                    version %s
 
-# http://android.stackexchange.com/questions/23357/\
-# is-there-a-way-to-look-inside-and-modify-an-adb-backup-created-file/\
-# 23608#23608
-0      string  ANDROID\040BACKUP\n     Android Backup
->15    string  1\n                     \b, version 1
->17    string  0\n                     \b, uncompressed
->17    string  1\n                     \b, compressed
->19    string  none\n                  \b, unencrypted
->19    string  AES-256\n               \b, encrypted AES-256
-
-# Android bootimg format
-# From https://android.googlesource.com/\
-# platform/system/core/+/master/mkbootimg/bootimg.h
-0              string  ANDROID!        Android bootimg
->8             lelong  >0                      \b, kernel
->>12   lelong  >0                      \b (0x%x)
->16            lelong  >0                      \b, ramdisk
->>20   lelong  >0                      \b (0x%x)
->24            lelong  >0                      \b, second stage
->>28   lelong  >0                      \b (0x%x)
->36            lelong  >0                      \b, page size: %d
->38            string  >0                      \b, name: %s
->64            string  >0                      \b, cmdline (%s)
-# Dalvik .dex format. http://retrodev.com/android/dexformat.html
-# From <mkf@google.com> "Mike Fleming"
-# Fixed to avoid regexec 17 errors on some dex files
-# From <diff@lookout.com> "Tim Strazzere"
-0      string  dex\n
->0     regex   dex\n[0-9]{2}\0 Dalvik dex file
->4     string  >000                    version %s
-0      string  dey\n
->0     regex   dey\n[0-9]{2}\0 Dalvik dex file (optimized for host)
->4     string  >000                    version %s
-
-# http://android.stackexchange.com/questions/23357/\
-# is-there-a-way-to-look-inside-and-modify-an-adb-backup-created-file/\
-# 23608#23608
-0      string  ANDROID\040BACKUP\n     Android Backup
->15    string  1\n                     \b, version 1
->17    string  0\n                     \b, uncompressed
->17    string  1\n                     \b, compressed
->19    string  none\n                  \b, unencrypted
->19    string  AES-256\n               \b, encrypted AES-256
-
 # Android bootimg format
 # From https://android.googlesource.com/\
 # platform/system/core/+/master/mkbootimg/bootimg.h
 0              string  ANDROID!        Android bootimg
+>1024  string  LOKI\01         \b, LOKI'd
 >8             lelong  >0                      \b, kernel
 >>12   lelong  >0                      \b (0x%x)
 >16            lelong  >0                      \b, ramdisk