[Android] Revert "proguard: no optims, keep everything"

[Thomas Guillem]

vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Oct 19 11:26:06 2015 +0200| [8b9b5bcff398f21c45184661185bb39f5ce61508] | committer: Thomas Guillem

Revert "proguard: no optims, keep everything"

This reverts commit 83562ecaba1288011916496e51c02adb32a4cc39.

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=8b9b5bcff398f21c45184661185bb39f5ce61508
---

 vlc-android/proguard.cfg |   21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/vlc-android/proguard.cfg b/vlc-android/proguard.cfg
index 3338d79..4859c16 100644
--- a/vlc-android/proguard.cfg
+++ b/vlc-android/proguard.cfg
@@ -1,16 +1,13 @@
-# Samsung/Wiko/Qmobile shit workaround
-# see https://code.google.com/p/android/issues/detail?id=78377
--keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
+-optimizationpasses 5
+-dontusemixedcaseclassnames
 -dontskipnonpubliclibraryclasses
 -dontobfuscate
 -dontpreverify
 -verbose
--dontoptimize
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable
 
-# Keep our code
+# Do not optimize/shrink LibVLC, because of native code
 -keep class org.videolan.libvlc.** { *; }
--keep class org.videolan.vlc.** { *; }
--keep class com.android.widget.** { *; }
 
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Application
@@ -21,13 +18,9 @@
 -keep public class * extends android.preference.Preference
 -keep public class com.android.vending.licensing.ILicensingService
 
-# Samsung/Wiko/Qmobile shit workaround
--keep class android.support.v4.app.** { *; }
--keep interface android.support.v4.app.** { *; }
--keep class android.support.v7.app.** { *; }
--keep interface android.support.v7.app.** { *; }
--keep class android.support.v7.widget.** { *; }
--keep interface android.support.v7.widget.** { *; }
+# Samsung shit workaround
+# see https://code.google.com/p/android/issues/detail?id=78377#c160
+-keep class !android.support.v7.internal.view.menu.**, android.support.v7.** { *; }
 
 -keepclasseswithmembernames class * {
     native <methods>;