Use explicit support library prebuilts (dd125259) · Commits · e / os / android_packages_apps_DeskClock

Android.mk

+9 −26

Original line number	Diff line number	Diff line
		@@ -3,18 +3,6 @@ include $(CLEAR_VARS)

		LOCAL_RESOURCE_DIR := packages/apps/DeskClock/res

		ifeq ($(TARGET_BUILD_APPS),)
		LOCAL_RESOURCE_DIR += frameworks/support/compat/res
		LOCAL_RESOURCE_DIR += frameworks/support/design/res
		LOCAL_RESOURCE_DIR += frameworks/support/percent/res
		LOCAL_RESOURCE_DIR += frameworks/support/transition/res
		LOCAL_RESOURCE_DIR += frameworks/support/v14/preference/res
		LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
		LOCAL_RESOURCE_DIR += frameworks/support/v7/gridlayout/res
		LOCAL_RESOURCE_DIR += frameworks/support/v7/preference/res
		LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res
		else
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/compat/res
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/design/res
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/percent/res
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/transition/res
		@@ -23,7 +11,6 @@ LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/gridlayout/res
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/preference/res
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/recyclerview/res
		endif

		LOCAL_MODULE_TAGS := optional
		LOCAL_SDK_VERSION := current
		@@ -33,19 +20,15 @@ LOCAL_OVERRIDES_PACKAGES := AlarmClock

		LOCAL_SRC_FILES := $(call all-java-files-under, src gen)

		LOCAL_PROGUARD_FLAG_FILES := ../../../frameworks/support/design/proguard-rules.pro
		LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/preference/proguard-rules.pro
		LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/recyclerview/proguard-rules.pro

		LOCAL_STATIC_JAVA_LIBRARIES := android-support-design
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-percent
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-transition
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview
		LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-prebuilt
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-percent-prebuilt
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-transition-prebuilt
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13-prebuilt
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference-prebuilt
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat-prebuilt
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout-prebuilt
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference-prebuilt
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview-prebuilt

		LOCAL_AAPT_FLAGS := --auto-add-overlay
		LOCAL_AAPT_FLAGS += --extra-packages android.support.compat