[Android] Revert changes on proguard.cfg

[Thomas Guillem]

vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Oct 12 14:32:24 2015 +0200| [912266f18eadba6ba6caf1628f9e33a6a2ff7a51] | committer: Jean-Baptiste Kempf

Revert changes on proguard.cfg

We need a faulty device instead of doing blind commits.

This reverts commit 890510c053324a1a2aecd137c529138cd6451aab.
This reverts commit 3af3a6795b94e46ba6a69cd0f497c53a88749b08.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

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

diff --git a/vlc-android/proguard.cfg b/vlc-android/proguard.cfg
index 8a22fbd..4859c16 100644
--- a/vlc-android/proguard.cfg
+++ b/vlc-android/proguard.cfg
@@ -1,3 +1,4 @@
+-optimizationpasses 5
 -dontusemixedcaseclassnames
 -dontskipnonpubliclibraryclasses
 -dontobfuscate
@@ -17,14 +18,9 @@
 -keep public class * extends android.preference.Preference
 -keep public class com.android.vending.licensing.ILicensingService
 
-# Samsung, wiki and QMobile shit workaround
+# Samsung shit workaround
 # see https://code.google.com/p/android/issues/detail?id=78377#c160
--keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
--dontoptimize
--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.internal.view.menu.**, android.support.v7.** { *; }
 
 -keepclasseswithmembernames class * {
     native <methods>;