summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeigo Nonaka <nona@google.com>2017-04-19 16:22:49 -0700
committerSeigo Nonaka <nona@google.com>2017-04-19 16:22:49 -0700
commit5805f6cee4b36891435a85a7f59af6a4c1fbeb7e (patch)
tree89586ddce821e90135fd6897ff8a54ecff22825d
parentbe75ef75826bff9c39df0f4a66e493351a0ddfe2 (diff)
downloadandroid_packages_apps_DeskClock-5805f6cee4b36891435a85a7f59af6a4c1fbeb7e.tar.gz
android_packages_apps_DeskClock-5805f6cee4b36891435a85a7f59af6a4c1fbeb7e.tar.bz2
android_packages_apps_DeskClock-5805f6cee4b36891435a85a7f59af6a4c1fbeb7e.zip
Fix build DeskClock
Bug: N/A Test: N/A Change-Id: I63da9e454514f796eb15d2c46b4a8dd2f1ee99c3
-rw-r--r--Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index f757e7f0a..52f565df9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,6 +4,7 @@ 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
@@ -13,6 +14,7 @@ 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
@@ -46,6 +48,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview
LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --extra-packages android.support.compat
LOCAL_AAPT_FLAGS += --extra-packages android.support.design
LOCAL_AAPT_FLAGS += --extra-packages android.support.percent
LOCAL_AAPT_FLAGS += --extra-packages android.support.transition