From 6b1b96c9f46797ae5b22d8d4865bc8bf3a41f214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <turl@tuxfamily.org>
Date: Tue, 10 May 2011 18:41:23 +0000
Subject: [PATCH] Revert "Add target specific option to skip wallpapers from
 build"

This reverts commit a185fd8b356995fa22da05ce9b5d384758411762.
This commit is broken and disables wallpapers and themes on anything
under vega (zeppelin, zero for example)
---
 products/common.mk        | 7 +------
 products/cyanogen_vega.mk | 5 ++---
 products/themes.mk        | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/products/common.mk b/products/common.mk
index a1f8629a..64a02685 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -37,16 +37,11 @@ PRODUCT_PACKAGES += \
     CMParts \
     CMStats \
     CMUpdateNotify \
+    CMWallpapers \
     DSPManager \
     libcyanogen-dsp \
     Pacman
 
-# make wallpapers optional for low-storage-devices
-ifneq ($(PRODUCT_SKIP_WALLPAPERS),true)
-PRODUCT_PACKAGES += \
-    CMWallpapers
-endif
-
 # Extra tools in CyanogenMod
 PRODUCT_PACKAGES += \
     openvpn
diff --git a/products/cyanogen_vega.mk b/products/cyanogen_vega.mk
index 18306c72..76144b30 100644
--- a/products/cyanogen_vega.mk
+++ b/products/cyanogen_vega.mk
@@ -1,8 +1,7 @@
 $(call inherit-product, device/advent/vega/vega.mk)
 
-# skips themes and wallpaper to keep the resulting rom tiny so it fits on /system/ with all languages included
-PRODUCT_SKIP_THEMES=true
-PRODUCT_SKIP_WALLPAPERS=true
+# skips themes and keeps the resulting rom tiny so it fits on /system/ with all languages included
+PRODUCT_SPECIFIC_DEFINES += SKIP_THEMES=true
 
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common_full.mk)
diff --git a/products/themes.mk b/products/themes.mk
index 03ef574b..856ab1f9 100644
--- a/products/themes.mk
+++ b/products/themes.mk
@@ -1,6 +1,6 @@
 # Theme packages
 
-ifneq ($(PRODUCT_SKIP_THEMES),true)
+ifneq ($(SKIP_THEMES),true)
 PRODUCT_PACKAGES += \
        Androidian \
        Cyanbread