From 40db1c1b930f1d816ecc56f39445843eb72b4642 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Mon, 20 Aug 2012 12:31:14 -0700
Subject: Install the permission xml file if LiveWallpapersPicker is installed.

Bug: 7019907
Change-Id: I75ee7df305e9e4f2ff0f8816d77ed7344a6db1ab
---
 Android.mk | 9 ++++-----
 1 file 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
-- 
cgit v1.2.3