summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2015-07-28 01:24:45 (GMT)
committerHyunyoung Song <hyunyoungs@google.com>2015-07-28 01:24:45 (GMT)
commitd30e845d89a069a8c1ee687791030e8e981170b3 (patch)
tree360993db536163dd0cb00a5ea5d6a3a1bb50fb82 /Android.mk
parenta9095e07ddd2318ceb81a2794219e07dd112df72 (diff)
downloadandroid_packages_apps_Trebuchet-d30e845d89a069a8c1ee687791030e8e981170b3.zip
android_packages_apps_Trebuchet-d30e845d89a069a8c1ee687791030e8e981170b3.tar.gz
android_packages_apps_Trebuchet-d30e845d89a069a8c1ee687791030e8e981170b3.tar.bz2
Overlay support lib RV resources in Android.mk
Note: after this change, ag/735298 can be reverted. b/22719084 Change-Id: I83caf8832790b1df0a90a1339f6b24f481c51661
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk15
1 files changed, 12 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 3ff542e..ec675c6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,16 +23,25 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-v4 \
+ android-support-v7-recyclerview
+
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-java-files-under, WallpaperPicker/src) \
$(call all-proto-files-under, protos)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res $(LOCAL_PATH)/res
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res \
+ $(LOCAL_PATH)/res \
+ $(LOCAL_PATH)/../../../prebuilts/sdk/current/support/v7/recyclerview/res
+
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v7-recyclerview
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
-LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS := \
+ --auto-add-overlay \
+ --extra-packages android.support.v7.recyclerview
LOCAL_SDK_VERSION := current
LOCAL_PACKAGE_NAME := Launcher3