From eb7a385c4cb185065b6610ce3e8debb8146f450f Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Mon, 5 Jul 2010 18:24:50 -0400
Subject: Clean up the device config.

---
 setup-makefiles.sh | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'setup-makefiles.sh')

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index ac46bba..e3b8868 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -18,7 +18,7 @@ DEVICE=dream_sapphire
 
 mkdir -p ../../../vendor/htc/$DEVICE
 
-(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/$DEVICE/device_$DEVICE-vendor.mk
+(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/$DEVICE/$DEVICE-vendor.mk
 # Copyright (C) 2010 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +35,22 @@ mkdir -p ../../../vendor/htc/$DEVICE
 
 # This file is generated by device/htc/__DEVICE__/setup-makefiles.sh
 
-\$(call inherit-product, vendor/htc/__DEVICE__/device___DEVICE__-vendor-blobs.mk)
+# Live wallpaper packages
+PRODUCT_PACKAGES := \\
+    LiveWallpapers \\
+    LiveWallpapersPicker \\
+    MagicSmokeWallpapers \\
+    VisualizationWallpapers \\
+    librs_jni
+
+# Publish that we support the live wallpaper feature.
+PRODUCT_COPY_FILES := \\
+    packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml
+
+# Pick up overlay for features that depend on non-open-source files
+DEVICE_PACKAGE_OVERLAYS := vendor/htc/__DEVICE__/overlay
+
+\$(call inherit-product, vendor/htc/__DEVICE__/__DEVICE__-vendor-blobs.mk)
 EOF
 
 (cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/$DEVICE/BoardConfigVendor.mk
-- 
cgit v1.2.3