1 files changed, 3 insertions, 14 deletions
diff --git a/proguard.flags b/proguard.flags
index 45221e211..8cb04867d 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -64,23 +64,12 @@
 # For unit testing:
 
 # - Required for running exif tests on userdebug
--keepclassmembers class com.android.gallery3d.exif.ExifTag {
-  *** setValue(...);
-  *** valueToString(...);
-}
--keepclassmembers class com.android.gallery3d.exif.ExifParser {
-  *** parse(...);
-}
+-keep class com.android.gallery3d.exif.ExifTag { *; }
+-keep class com.android.gallery3d.exif.ExifData { *; }
+-keep class com.android.gallery3d.exif.ExifInterface { *; }
 -keepclassmembers class com.android.gallery3d.exif.Util {
   *** closeSilently(...);
 }
--keepclassmembers class com.android.gallery3d.exif.ExifData {
-  *** addInteroperabilityTag(...);
-  *** addThumbnailTag(...);
-  *** getTag(...);
-  *** getInteroperabilityTag(...);
-  *** getThumbnailTag(...);
-}
 
 # - Required for running blobcache tests on userdebug
 -keep class com.android.gallery3d.common.BlobCache { *; }