diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-01-25 18:04:43 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-25 18:04:43 -0800 |
commit | af6154f52bb590f20f3700e1635776a76b805891 (patch) | |
tree | 47a404d1d21c8b5b542d6c0a29e7dc6ce9b7aa08 /Android.mk | |
parent | 4a63d67799150204928d84e94c790c3836afbed5 (diff) | |
parent | ebd8b7dd77b015e10b7ed3a45ba6903e48127d48 (diff) | |
download | android_packages_wallpapers_LivePicker-af6154f52bb590f20f3700e1635776a76b805891.tar.gz android_packages_wallpapers_LivePicker-af6154f52bb590f20f3700e1635776a76b805891.tar.bz2 android_packages_wallpapers_LivePicker-af6154f52bb590f20f3700e1635776a76b805891.zip |
am ebd8b7dd: Fix issue #2395667: Pull LW Picker apk from Droid build
Merge commit 'ebd8b7dd77b015e10b7ed3a45ba6903e48127d48' into eclair-plus-aosp
* commit 'ebd8b7dd77b015e10b7ed3a45ba6903e48127d48':
Fix issue #2395667: Pull LW Picker apk from Droid build
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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 |