diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 22:30:24 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 22:30:24 -0800 |
| commit | 0d0460a4097c29ce35d6e40131cc289348f1853f (patch) | |
| tree | 08b6fe415dbf539c19edfd28a974e53c261942dc /Android.mk | |
| parent | 19d496aa4a2102e4d2e91c09b12cf2c0fd4c2047 (diff) | |
| parent | f14b1d2e17ee862b84c9acb88f299984c6e969d9 (diff) | |
| download | android_packages_wallpapers_LivePicker-0d0460a4097c29ce35d6e40131cc289348f1853f.tar.gz android_packages_wallpapers_LivePicker-0d0460a4097c29ce35d6e40131cc289348f1853f.tar.bz2 android_packages_wallpapers_LivePicker-0d0460a4097c29ce35d6e40131cc289348f1853f.zip | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/wallpapers/LivePicker into HEADcm-10.1-M1
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -21,20 +21,17 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.software.live_wallpaper.xml -#LOCAL_MODULE_TAGS := user - LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional + # This will install the file in /system/etc/permissions # LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions LOCAL_SRC_FILES := $(LOCAL_MODULE) -# 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 $(BUILD_PREBUILT) ######################## include $(CLEAR_VARS) @@ -42,7 +39,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) -#LOCAL_REQUIRES_MODULE := android.software.live_wallpaper.xml +LOCAL_REQUIRED_MODULES := android.software.live_wallpaper.xml LOCAL_PACKAGE_NAME := LiveWallpapersPicker LOCAL_CERTIFICATE := platform |