[Android] Update the Samsung issue with appcompat 23.1.1

Jean-Baptiste Kempf git at videolan.org
Fri Nov 20 15:33:31 CET 2015


vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Nov 20 15:32:41 2015 +0100| [e6cc6df7d9796260b1298778d621fd65692b902a] | committer: Jean-Baptiste Kempf

Update the Samsung issue with appcompat 23.1.1

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

 vlc-android/proguard.cfg |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/vlc-android/proguard.cfg b/vlc-android/proguard.cfg
index 4859c16..729b285 100644
--- a/vlc-android/proguard.cfg
+++ b/vlc-android/proguard.cfg
@@ -3,6 +3,7 @@
 -dontskipnonpubliclibraryclasses
 -dontobfuscate
 -dontpreverify
+-dontwarn **
 -verbose
 -optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable
 
@@ -19,8 +20,9 @@
 -keep public class com.android.vending.licensing.ILicensingService
 
 # 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.** { *; }
+# see https://code.google.com/p/android/issues/detail?id=78377
+-keepattributes **
+-keep class !android.support.v7.view.menu.**,!android.support.design.internal.NavigationMenu,!android.support.design.internal.NavigationMenuPresenter,!android.support.design.internal.NavigationSubMenu,** {*;}
 
 -keepclasseswithmembernames class * {
     native <methods>;



More information about the Android mailing list