Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81bd85ab authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Depend settings on slices in the support library"

parents 546d4409 b2775579

Android.mk

+7 −2
Original line number Diff line number Diff line
@@ -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

proguard.flags

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 
-keepclasseswithmembers class * {

    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 @android.support.annotation.Keep class *