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

Commit ac44e410 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by Android (Google) Code Review
Browse files

Merge "Fix import of android-support-annotations"

parents 5db4e097 12a37963

packages/SettingsLib/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -5,8 +5,10 @@ LOCAL_USE_AAPT2 := true 


LOCAL_MODULE := SettingsLib



LOCAL_JAVA_LIBRARIES := \

    android-support-annotations



LOCAL_SHARED_ANDROID_LIBRARIES := \

    android-support-annotations \

    android-support-v4 \

    android-support-v7-recyclerview \

    android-support-v7-preference \

packages/SettingsLib/common.mk

+3 −1
Original line number Diff line number Diff line
@@ -14,8 +14,10 @@ 
#



ifeq ($(LOCAL_USE_AAPT2),true)

LOCAL_STATIC_JAVA_LIBRARIES += \

    android-support-annotations



LOCAL_STATIC_ANDROID_LIBRARIES += \

    android-support-annotations \

    android-support-v4 \

    SettingsLib

else