summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-09-10 23:34:09 (GMT)
committerSunny Goyal <sunnygoyal@google.com>2015-09-11 00:22:17 (GMT)
commitea9ad5cead9ad894fb670476bb5381198cdcf2de (patch)
treefcf23a25aadc660bd2dbb8b5178da454e8a00f08 /Android.mk
parent5845d3dbea53d513466c98b301eb49e96fe5d6a3 (diff)
parent4abaf133546b0c950edc82594985e9da50d9c1dd (diff)
downloadandroid_packages_apps_Trebuchet-ea9ad5cead9ad894fb670476bb5381198cdcf2de.zip
android_packages_apps_Trebuchet-ea9ad5cead9ad894fb670476bb5381198cdcf2de.tar.gz
android_packages_apps_Trebuchet-ea9ad5cead9ad894fb670476bb5381198cdcf2de.tar.bz2
Merge remote-tracking branch 'origin/ub-launcher3-burnaby' into mnc-dev
Conflicts: Android.mk Change-Id: I05429e418a25b94e7669e002d39bc70806396b8e
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 aade48a..3a6442a 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