summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-12-10 23:47:28 +0100
committerMichael Jurka <mikejurka@google.com>2013-12-10 23:47:28 +0100
commit39de459a8621abfc91382ce7b4cdd37d09aaac12 (patch)
tree21357b3a777ad0ab5eb9f2c9628157897b44602b /Android.mk
parent8e88cb84781907afb7cca80581fea2277264fd2c (diff)
downloadandroid_packages_apps_Trebuchet-39de459a8621abfc91382ce7b4cdd37d09aaac12.tar.gz
android_packages_apps_Trebuchet-39de459a8621abfc91382ce7b4cdd37d09aaac12.tar.bz2
android_packages_apps_Trebuchet-39de459a8621abfc91382ce7b4cdd37d09aaac12.zip
Revert "Move wallpaper picker code to a separate directory"
This reverts commit 8e88cb84781907afb7cca80581fea2277264fd2c.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 6059a3f98..3bd20a7cd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,12 +26,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
- $(call all-java-files-under, wallpaper_picker_src) \
$(call all-renderscript-files-under, src) \
$(call all-proto-files-under, protos)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/wallpaper_picker_res $(LOCAL_PATH)/res
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/