summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk11
1 files changed, 4 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk
index d532303..75b3388 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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