summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-01-25 17:02:28 -0800
committerDianne Hackborn <hackbod@google.com>2010-01-25 17:02:28 -0800
commitebd8b7dd77b015e10b7ed3a45ba6903e48127d48 (patch)
tree47a404d1d21c8b5b542d6c0a29e7dc6ce9b7aa08
parentbec218167e80177e9f026cda83b86916a0d2e641 (diff)
downloadandroid_packages_wallpapers_LivePicker-ebd8b7dd77b015e10b7ed3a45ba6903e48127d48.zip
android_packages_wallpapers_LivePicker-ebd8b7dd77b015e10b7ed3a45ba6903e48127d48.tar.gz
android_packages_wallpapers_LivePicker-ebd8b7dd77b015e10b7ed3a45ba6903e48127d48.tar.bz2
Fix issue #2395667: Pull LW Picker apk from Droid build
My tricky stuff to add the live wallpaper feature if the live wallpaper picker is included in the system was too tricky for me, and doesn't work. It just always got added. Remove this for now, requiring that products explicitly include this feature definition.
-rw-r--r--Android.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index a682ef3..0f73b50 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,7 +21,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := android.software.live_wallpaper.xml
-LOCAL_MODULE_TAGS := user
+#LOCAL_MODULE_TAGS := user
LOCAL_MODULE_CLASS := ETC
@@ -31,7 +31,10 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
+# XXX the intention is that this file be copied automatically when
+# LiveWallpaperPicker is being bundled with a system. Unfortunately
+# it isn't working correctly (it always gets copied).
+#include $(BUILD_PREBUILT)
########################
include $(CLEAR_VARS)
@@ -39,7 +42,7 @@ include $(CLEAR_VARS)
#LOCAL_MODULE_TAGS := user
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_REQUIRES_MODULE := android.software.live_wallpaper.xml
+#LOCAL_REQUIRES_MODULE := android.software.live_wallpaper.xml
LOCAL_PACKAGE_NAME := LiveWallpapersPicker
LOCAL_CERTIFICATE := platform