Snap for 4807121 from 742282346a265eebdc0258254050ae42baa24fb2 to pi-release

[android-x86/packages-apps-Gallery2.git] / proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 45221e2..72cba51 100644 (file)
--- a/proguard.flags
+++ b/proguard.flags
@@ -14,11 +14,6 @@
   <init>(...);
 }
 
--keep class com.android.camera.ActivityBase {
-  public int getResultCode();
-  public android.content.Intent getResultData();
-}
-
 -keep class com.android.camera.CameraActivity {
   public boolean isRecording();
   public long getAutoFocusTime();
@@ -45,8 +40,6 @@
 # Disable the warnings of using dynamic method calls in EffectsRecorder
 -dontnote com.android.camera.EffectsRecorder
 
--keep class android.support.v8.renderscript.** { *; }
-
 # Required for ActionBarSherlock
 -keep class android.support.v4.app.** { *; }
 -keep interface android.support.v4.app.** { *; }
@@ -64,23 +57,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 { *; }
@@ -95,3 +77,10 @@
   *** toArray(...);
 }
 -keep class com.android.gallery3d.util.ProfileData { *; }
+
+# - Required for running jpeg stream tests on userdebug
+-keep class com.android.gallery3d.jpegstream.JPEGOutputStream { *; }
+-keep class com.android.gallery3d.jpegstream.JPEGInputStream { *; }
+-keep class com.android.gallery3d.jpegstream.StreamUtils { *; }
+
+