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

Commit 40a1c33e authored by Xin Li's avatar Xin Li
Browse files

Merge Android Pie into master 

Bug: 112104996
Change-Id: I4930d57cc584503a8e16e2b69549efb5780faad8
parents aa2ec5f2 000f97dc

Android.mk

+9 −2
Original line number Diff line number Diff line
@@ -21,13 +21,17 @@ 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-compat \

    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 \
@@ -35,8 +39,11 @@ LOCAL_JAVA_LIBRARIES := \ 
    ims-common



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-arch-lifecycle-runtime \

    android-arch-lifecycle-extensions \

    guava \

    jsr305 \

    settings-logtags

    settings-logtags \



LOCAL_PROGUARD_FLAG_FILES := proguard.flags