Merge "Always get Support Library resources from prebuilts" (1af6394e) · Commits · e / os / android_frameworks_base

packages/SettingsLib/common.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -34,21 +34,21 @@ LOCAL_RESOURCE_DIR += $(call my-dir)/res

		# 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_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 += frameworks/support/v7/recyclerview/res
		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 += frameworks/support/v7/preference/res
		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