diff --git a/eyes-two/build.gradle b/eyes-two/build.gradle index 18e2ad440..0ce7a5cb8 100644 --- a/eyes-two/build.gradle +++ b/eyes-two/build.gradle @@ -14,8 +14,6 @@ android { targetSdkVersion 9 versionCode 1 versionName "1.0" - proguardFiles 'proguard-rules.pro' - consumerProguardFiles 'proguard-rules.pro' } sourceSets { @@ -52,7 +50,7 @@ android { tasks.withType(Delete) { cleanTask -> cleanTask.dependsOn ndkClean - } + } lintOptions { abortOnError false diff --git a/eyes-two/proguard-rules.pro b/eyes-two/proguard-rules.pro deleted file mode 100644 index 1092ca2be..000000000 --- a/eyes-two/proguard-rules.pro +++ /dev/null @@ -1,66 +0,0 @@ -# -# Adapted from example file: -# android-sdk/tools/proguard/examples/library.pro -# -# This ProGuard configuration file illustrates how to process a program -# library, such that it remains usable as a library. -# - -# Don't obfuscate field and method names. - --dontobfuscate - -# Preserve all annotations. - --keepattributes *Annotation* - -# Preserve all public classes, and their public and protected fields and -# methods. - --keep public class * { - public protected *; -} - -# Preserve all .class method names. - --keepclassmembernames class * { - java.lang.Class class$(java.lang.String); - java.lang.Class class$(java.lang.String, boolean); -} - -# Preserve all native method names and the names of their classes. - --keepclasseswithmembernames class * { - native ; -} - -# Preserve the special static methods that are required in all enumeration -# classes. - --keepclassmembers class * extends java.lang.Enum { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - -# Explicitly preserve all serialization members. The Serializable interface -# is only a marker interface, so it wouldn't save them. -# You can comment this out if your library doesn't use serialization. -# If your code contains serializable classes that have to be backward -# compatible, please refer to the manual. - --keepclassmembers class * implements java.io.Serializable { - static final long serialVersionUID; - static final java.io.ObjectStreamField[] serialPersistentFields; - private void writeObject(java.io.ObjectOutputStream); - private void readObject(java.io.ObjectInputStream); - java.lang.Object writeReplace(); - java.lang.Object readResolve(); -} - -# Your library may contain more items that need to be preserved; -# typically classes that are dynamically created using Class.forName: - -# -keep public class mypackage.MyClass -# -keep public interface mypackage.MyInterface -# -keep public class * implements mypackage.MyInterface - diff --git a/tess-two/build.gradle b/tess-two/build.gradle index afc16f2ac..2d2982e2a 100644 --- a/tess-two/build.gradle +++ b/tess-two/build.gradle @@ -16,7 +16,6 @@ android { targetSdkVersion 22 versionCode 1 versionName "1.0" - proguardFiles 'proguard-rules.pro' consumerProguardFiles 'proguard-rules.pro' } @@ -57,7 +56,7 @@ android { tasks.withType(Delete) { cleanTask -> cleanTask.dependsOn ndkClean - } + } } dependencies { diff --git a/tess-two/proguard-rules.pro b/tess-two/proguard-rules.pro index 3a6a20043..5a191ad5e 100644 --- a/tess-two/proguard-rules.pro +++ b/tess-two/proguard-rules.pro @@ -1,68 +1,4 @@ -# -# Adapted from example file: -# android-sdk/tools/proguard/examples/library.pro -# -# This ProGuard configuration file illustrates how to process a program -# library, such that it remains usable as a library. -# - -# Don't obfuscate field and method names. - --dontobfuscate - -# Preserve all annotations. - --keepattributes *Annotation* - -# Preserve all public classes, and their public and protected fields and -# methods. - --keep public class * { - public protected *; -} - -# Preserve all .class method names. - --keepclassmembernames class * { - java.lang.Class class$(java.lang.String); - java.lang.Class class$(java.lang.String, boolean); -} - -# Preserve all native method names and the names of their classes. - --keepclasseswithmembernames class * { - native ; -} - -# Preserve the special static methods that are required in all enumeration -# classes. - --keepclassmembers class * extends java.lang.Enum { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - -# Explicitly preserve all serialization members. The Serializable interface -# is only a marker interface, so it wouldn't save them. -# You can comment this out if your library doesn't use serialization. -# If your code contains serializable classes that have to be backward -# compatible, please refer to the manual. - --keepclassmembers class * implements java.io.Serializable { - static final long serialVersionUID; - static final java.io.ObjectStreamField[] serialPersistentFields; - private void writeObject(java.io.ObjectOutputStream); - private void readObject(java.io.ObjectInputStream); - java.lang.Object writeReplace(); - java.lang.Object readResolve(); -} - -# Your library may contain more items that need to be preserved; -# typically classes that are dynamically created using Class.forName: - -# -keep public class mypackage.MyClass -# -keep public interface mypackage.MyInterface -# -keep public class * implements mypackage.MyInterface +# Preserve a method that is called from native code. -keep class com.googlecode.tesseract.android.TessBaseAPI { protected void onProgressValues(int, int, int, int, int, int, int, int, int);