Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_vendor_cyanogen into gingerbread

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

products/cyanogen_ace.mk

@@ -15,7 +15,7 @@ PRODUCT_BRAND := htc_wwe
 PRODUCT_DEVICE := ace
 PRODUCT_MODEL := Desire HD
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_ace BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=htc_wwe/htc_ace/ace/ace:2.2.1/FRG83D/296490:user/release-keys PRIVATE_BUILD_DESC="1.72.405.3 CL296490 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_ace BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=htc_wwe/htc_ace/ace:2.3.3/GRI40/47853:user/release-keys PRIVATE_BUILD_DESC="2.36.405.8 CL47853 release-keys"
 
 # Build kernel
 #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=

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)

products/themes.mk

@@ -1,6 +1,6 @@
 # Theme packages
 
-ifneq ($(PRODUCT_SKIP_THEMES),true)
+ifneq ($(SKIP_THEMES),true)
 PRODUCT_PACKAGES += \
        Androidian \
        Cyanbread