commit 07da88f01f3904248eb78ffe052d49be3ef94295
author Steve Kondik <shade@chemlab.org> Wed Dec 22 01:51:22 2010 +0000
committer Gerrit Code Review <gerrit@review.cyanogenmod.com> Wed Dec 22 01:51:22 2010 +0000
tree cea09c683f632ce6a198c0470e21148cce9b058d
parent dc5f4743c2082968a491016b64f48ea62f61fdae
parent 7d3ab80c106dc9c51b5b4d50ee1ec9e5b23f3cb1

Merge "vendor-cyanogen: update mod version in backuptool" into gingerbread

products/cyanogen_ace.mk

diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
index 1714a0f..d18e71f 100644
--- a/products/cyanogen_ace.mk
+++ b/products/cyanogen_ace.mk
@@ -25,6 +25,9 @@
 # Extra Ace overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ace
 
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
 #
 # Set ro.modversion
 #

products/cyanogen_bravo.mk

diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index fd2e3b8..66db328 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -25,15 +25,15 @@
 # Extra Bravo (CDMA/GSM) overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bravo
 
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
 # Extra RIL settings
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.ril.enable.managed.roaming=1 \
     ro.ril.oem.nosim.ecclist=911,112,113,115,117,999,000,08,118,120,122,110,119,995 \
     ro.ril.emc.mode=2
 
-# Enable Windows Media
-WITH_WINDOWS_MEDIA := true
-
 #
 # Set ro.modversion
 #

products/cyanogen_bravoc.mk

diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk
index 75a91f1..6de2152 100644
--- a/products/cyanogen_bravoc.mk
+++ b/products/cyanogen_bravoc.mk
@@ -22,8 +22,8 @@
 # Extra Bravo (CDMA/GSM) overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bravo
 
-# Enable Windows Media
-WITH_WINDOWS_MEDIA := true
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
 
 #
 # Set ro.modversion