diff options
author | Ying Wang <wangying@google.com> | 2012-08-20 12:54:43 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-20 12:54:43 -0700 |
commit | 416e1f87640ea993c19b141f343d5bbba3f3b41a (patch) | |
tree | 8f0fab96b9cd3f87cc4a10132d6fd260fd02a825 | |
parent | 9649043a43da07fff43d6dd2f64fae687ec4ba36 (diff) | |
parent | 40db1c1b930f1d816ecc56f39445843eb72b4642 (diff) | |
download | android_packages_wallpapers_LivePicker-416e1f87640ea993c19b141f343d5bbba3f3b41a.tar.gz android_packages_wallpapers_LivePicker-416e1f87640ea993c19b141f343d5bbba3f3b41a.tar.bz2 android_packages_wallpapers_LivePicker-416e1f87640ea993c19b141f343d5bbba3f3b41a.zip |
am 40db1c1b: Install the permission xml file if LiveWallpapersPicker is installed.
* commit '40db1c1b930f1d816ecc56f39445843eb72b4642':
Install the permission xml file if LiveWallpapersPicker is installed.
-rw-r--r-- | Android.mk | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -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 |