OSDN Git Service
(root)
/
android-x86
/
packages-apps-Gallery2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make Gallery2 use platform RenderScript
[android-x86/packages-apps-Gallery2.git]
/
proguard.flags
diff --git
a/proguard.flags
b/proguard.flags
index
45221e2
..
53693c1
100644
(file)
--- a/
proguard.flags
+++ b/
proguard.flags
@@
-14,11
+14,6
@@
<init>(...);
}
<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();
-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
# 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.** { *; }
# 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
# 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.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 { *; }
# - Required for running blobcache tests on userdebug
-keep class com.android.gallery3d.common.BlobCache { *; }
@@
-95,3
+77,8
@@
*** toArray(...);
}
-keep class com.android.gallery3d.util.ProfileData { *; }
*** 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 { *; }