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

Commit 4ceb49ca authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Migrate to AAPT2" into pi-dev 

am: 11bd1b60

Change-Id: Ia1221be6801af09823770458cf708eacd369981e
parents 018f5a3c 11bd1b60

packages/SettingsLib/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ include $(CLEAR_VARS) 


LOCAL_USE_AAPT2 := true



LOCAL_AAPT2_ONLY := true



LOCAL_MODULE := SettingsLib



LOCAL_JAVA_LIBRARIES := \

packages/SettingsLib/common.mk

+0 −42
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#   include frameworks/base/packages/SettingsLib/common.mk

#



ifeq ($(LOCAL_USE_AAPT2),true)

LOCAL_STATIC_JAVA_LIBRARIES += \

    android-support-annotations \

    android-arch-lifecycle-common
@@ -26,45 +25,4 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \ 
    android-support-v7-appcompat \

    android-support-v14-preference \

    SettingsLib

else

LOCAL_RESOURCE_DIR += $(call my-dir)/res



## Include transitive dependencies below



# Include support-v7-appcompat, if not already included

ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES)))

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat

endif



# Include support-v7-recyclerview, if not already included

ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_JAVA_LIBRARIES)))

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/recyclerview/res

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview

endif



# Include android-support-v7-preference, if not already included

ifeq (,$(findstring android-support-v7-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/preference/res

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.preference

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference

endif



# Include android-support-v14-preference, if not already included

ifeq (,$(findstring android-support-v14-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))

LOCAL_AAPT_FLAGS += --extra-packages android.support.v14.preference

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference

endif



LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.settingslib



LOCAL_STATIC_JAVA_LIBRARIES += \

    android-support-annotations \

    android-support-v4 \

    android-arch-lifecycle-runtime \

    android-arch-lifecycle-common \

    SettingsLib

endif