summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-08-20 12:31:14 -0700
committerYing Wang <wangying@google.com>2012-08-20 12:31:14 -0700
commit40db1c1b930f1d816ecc56f39445843eb72b4642 (patch)
tree8f0fab96b9cd3f87cc4a10132d6fd260fd02a825 /Android.mk
parent19d6fffc67cdabb5a7bc5341e696515a05fe97ab (diff)
downloadandroid_packages_wallpapers_LivePicker-40db1c1b930f1d816ecc56f39445843eb72b4642.zip
android_packages_wallpapers_LivePicker-40db1c1b930f1d816ecc56f39445843eb72b4642.tar.gz
android_packages_wallpapers_LivePicker-40db1c1b930f1d816ecc56f39445843eb72b4642.tar.bz2
Install the permission xml file if LiveWallpapersPicker is installed.
Bug: 7019907 Change-Id: I75ee7df305e9e4f2ff0f8816d77ed7344a6db1ab
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 1a5407a..75b3388 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,16 +23,15 @@ LOCAL_MODULE := android.software.live_wallpaper.xml
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)
@@ -40,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