PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Depend settings on slices in the support library

Browse Source 
Test: make
Bug: 67996923
Change-Id: Ifcb544424df27f3faa8872e6266de286cc706d59
This commit is contained in:
Matthew Fritze
2017-12-05 10:46:47 -08:00
parent 4d9e1b4b6b
commit b277557991
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Android.mk
View File

@@ -20,13 +20,16 @@ LOCAL_USE_AAPT2 := true
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_ANDROID_LIBRARIES := \ LOCAL_STATIC_ANDROID_LIBRARIES := \
android-slices-builders \
android-slices-core \
android-slices-view \
android-support-v4 \ android-support-v4 \
android-support-v13 \ android-support-v13 \
android-support-v7-appcompat \ android-support-v7-appcompat \
android-support-v7-cardview \ android-support-v7-cardview \
android-support-v7-preference \ android-support-v7-preference \
android-support-v7-recyclerview \ android-support-v7-recyclerview \
android-support-v14-preference android-support-v14-preference \
LOCAL_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \
bouncycastle \ bouncycastle \
@@ -34,8 +37,10 @@ LOCAL_JAVA_LIBRARIES := \
ims-common ims-common
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
apptoolkit-arch-core-runtime \
apptoolkit-lifecycle-extensions \
jsr305 \ jsr305 \
settings-logtags settings-logtags \
LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_PROGUARD_FLAG_FILES := proguard.flags

3
proguard.flags
View File

@@ -27,6 +27,9 @@
-keepclasseswithmembers class * { -keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet, int); public <init>(android.content.Context, android.util.AttributeSet, int);
} }
-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet, int, int);
}
# Keep annotated classes or class members. # Keep annotated classes or class members.
-keep @android.support.annotation.Keep class * -keep @android.support.annotation.Keep class *