commit 846fece685f7c7eb5529cc1eb7578e4576c7b14f
author Dianne Hackborn <hackbod@google.com> Thu Jan 28 14:05:48 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 28 14:05:48 2010 -0800
tree d442237617f187e3cf48ecde921d3ac3f8fb20b9
parent d72a146eef91d084c2ed82ae8f9e0e89d891a22c
parent af6154f52bb590f20f3700e1635776a76b805891

am af6154f5: am ebd8b7dd: Fix issue #2395667: Pull LW Picker apk from Droid build

Merge commit 'af6154f52bb590f20f3700e1635776a76b805891'

* commit 'af6154f52bb590f20f3700e1635776a76b805891':
  Fix issue #2395667: Pull LW Picker apk from Droid build

Android.mk

diff --git a/Android.mk b/Android.mk
index 8bbb41a..3a00136 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,7 +21,7 @@
 
 LOCAL_MODULE := android.software.live_wallpaper.xml
 
-LOCAL_MODULE_TAGS := user
+#LOCAL_MODULE_TAGS := user
 
 LOCAL_MODULE_CLASS := ETC
 
@@ -31,7 +31,10 @@
 
 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 @@
 LOCAL_MODULE_TAGS := optional
 
 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