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

Commit dd1886aa authored by Fan Zhang's avatar Fan Zhang
Browse files

Add missing resource when building in AAPT1 

Bug: 36663882
Bug: 63450183
Test: global build
Change-Id: Id3cc8199e4572f4b5f733ea865f750b8600508bb
parent 89f2a518

packages/SettingsLib/common.mk

+33 −4
Original line number Diff line number Diff line
@@ -20,13 +20,42 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \ 
    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 += frameworks/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 += frameworks/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 += frameworks/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_RESOURCE_DIR += frameworks/support/v14/preference/res

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-support-v7-appcompat \

    android-support-v7-preference \

    android-support-v7-recyclerview \

    android-support-v14-preference \

    SettingsLib

endif