diff --git a/Android.mk b/Android.mk index c59d938f319..b9121ec19d9 100644 --- a/Android.mk +++ b/Android.mk @@ -20,13 +20,16 @@ LOCAL_USE_AAPT2 := true LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-slices-builders \ + android-slices-core \ + android-slices-view \ android-support-v4 \ android-support-v13 \ android-support-v7-appcompat \ android-support-v7-cardview \ android-support-v7-preference \ android-support-v7-recyclerview \ - android-support-v14-preference + android-support-v14-preference \ LOCAL_JAVA_LIBRARIES := \ bouncycastle \ @@ -34,8 +37,10 @@ LOCAL_JAVA_LIBRARIES := \ ims-common LOCAL_STATIC_JAVA_LIBRARIES := \ + apptoolkit-arch-core-runtime \ + apptoolkit-lifecycle-extensions \ jsr305 \ - settings-logtags + settings-logtags \ LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/proguard.flags b/proguard.flags index 7a403a4490c..0a299ed2340 100644 --- a/proguard.flags +++ b/proguard.flags @@ -27,6 +27,9 @@ -keepclasseswithmembers class * { public (android.content.Context, android.util.AttributeSet, int); } +-keepclasseswithmembers class * { + public (android.content.Context, android.util.AttributeSet, int, int); +} # Keep annotated classes or class members. -keep @android.support.annotation.Keep class *