Modified/removed files that the previous commit forgot.

38 files changed, 185 insertions, 1150 deletions

diff --git a/Android.mk b/Android.mk
index f9f2628..7afcaf7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1 @@
-# We need a way to prevent the stuff Google Apps replaces from being included in the build.
-# This is a hacky way to do that.
-ifdef CYANOGEN_WITH_GOOGLE
-    PACKAGES.Email.OVERRIDES := Provision LatinIME QuickSearchBox
-endif
+# We don't use Google non-free apps.
diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index 70508b9..0000000
--- a/CHANGELOG
+++ /dev/null
@@ -1 +0,0 @@
-Moved to http://github.com/CyanogenMod/android_vendor_cyanogen/blob/froyo/CHANGELOG.mkdn
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 004ad7f..c1b5551 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -1,3 +1,52 @@
+Replicant
+=========
+
+### 2.2 preview 0007
+
+What's new in this version (since 0006):
+* We are using a new ril (hycs-hardware_xdandroid-ril), which fixes telephony in the USA. Data should also work.
+* libhtc-acoustic has been fully replaced for HTC Dream, it fixes:
+  * in-call volume adjustment
+  * no mic wired headset support
+
+### 2.2 preview 0006
+
+What's new in this version since 0005:
+ * Wifi works again on the nexus one
+
+### 2.2 preview 0005
+
+What's new in this version since 0004:
+ * 0004 was removed because it contained old images,
+  That is to say: I forgott to rebuild the nexusone
+  That resulted in an old image for nexusone without 3g
+
+What's new in this version since 0003:
+ * Htc Dream and Nexus One should have working 3g
+
+### 2.2 preview 0003
+
+What's new in this version:
+ * HTC Dream should now work in USA(untested, please test),
+   Maybe the Nexus one works there too(tester needed).
+ * Nexus one should now display who is calling.
+
+### 2.2 preview 0002
+
+What's new in this version:
+
+HTC Dream:
+ *PIN support
+ *USSD
+ *GPS
+
+Nexus one(new target):
+ *GPS
+ *RIL
+ *sensors(accelerometers and rotations etc...)
+ *Graphic bug( http://code.google.com/p/android/issues/detail?id=11829 )
+   fixed but not upstreamed yet
+
 CyanogenMod
 ===============
 
diff --git a/README.mkdn b/README.mkdn
index f776536..a0be6f7 100644
--- a/README.mkdn
+++ b/README.mkdn
@@ -1,3 +1,38 @@
+Replicant
+=========
+
+About
+-----
+
+Replicant is a distribution of Android that is 100% Free Software.
+
+Most of Android is licensed freely under the Apache License 2.0. The Linux core is mostly Free Software under the GPLv2. However, there are numerous components of the default software stack on the devices that are proprietary software. Most notably, nearly any component that touches the hardware directly is proprietary software.
+
+We are not experts in embedded devices; we are just enthusiastic hackers that are giving a try.
+
+Note: As for now, Replicant may include components for which the license is not clear. See the reports on CyanogenMod issues tracker:
+* <http://code.google.com/p/cyanogenmod/issues/detail?id=3357>
+* <http://code.google.com/p/cyanogenmod/issues/detail?id=3764>
+
+Credits
+-------
+
+Replicant is based on CyanogenMod <http://www.cyanogenmod.com/> which is based on the Android Open Source Project <http://www.android.com/>. 
+Replicant vendor files are a modified version of CyanogenMod vendor files.
+
+Contributors
+------------
+
+Since replicant uses code from CyanogenMod, which uses code from AOSP, the list of contributors must be long.
+There is a list of people who contribute(d) to Replicant on <http://trac.osuosl.org/trac/replicant/wiki/People>. Note that this list is not exhaustive. 
+
+Copyright for the Logo
+----------------------
+
+Copyright 2011 Mirella Vedovetto 
+
+This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
+
 CyanogenMod
 ===========
 
diff --git a/extract-gapps-files b/extract-gapps-files
deleted file mode 100755
index ef99e52..0000000
--- a/extract-gapps-files
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# Extract gapps files from downloaded zip file.
-#
-# Just a replacement for get-google-files script.
-#
-
-usage() {
-    cat << EOF
-Usage: $0 <path-to-gapp-zip-file>
-EOF
-}
-
-if [ $# -lt 1 ]; then
-    usage
-    exit 1
-fi
-
-GAPPS="$1"
-
-cd `dirname $0`
-
-mkdir -p proprietary
-mkdir tmp
-
-unzip -q -o -d tmp $GAPPS
-
-find tmp/system -type f -exec mv -v -f {} proprietary/ \;
-
-rm -rf tmp
diff --git a/extract-google-files b/extract-google-files
deleted file mode 100755
index 27de164..0000000
--- a/extract-google-files
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-cd `dirname $0`
-mkdir -p proprietary
-
-adb pull /system/app/CarHomeGoogle.apk proprietary
-adb pull /system/app/CarHomeLauncher.apk proprietary
-adb pull /system/app/Facebook.apk proprietary
-adb pull /system/app/GenieWidget.apk proprietary
-adb pull /system/app/Gmail.apk proprietary
-adb pull /system/app/GoogleBackupTransport.apk proprietary
-adb pull /system/app/GoogleCalendarSyncAdapter.apk proprietary
-adb pull /system/app/GoogleContactsSyncAdapter.apk proprietary
-adb pull /system/app/GoogleFeedback.apk proprietary
-adb pull /system/app/GooglePartnerSetup.apk proprietary
-adb pull /system/app/GoogleQuickSearchBox.apk proprietary
-adb pull /system/app/GoogleServicesFramework.apk proprietary
-adb pull /system/app/HtcCopyright.apk proprietary
-adb pull /system/app/HtcEmailPolicy.apk proprietary
-adb pull /system/app/HtcSettings.apk proprietary
-adb pull /system/app/LatinImeGoogle.apk proprietary
-adb pull /system/app/LatinImeTutorial.apk proprietary
-adb pull /system/app/Maps.apk proprietary
-adb pull /system/app/MarketUpdater.apk proprietary
-adb pull /system/app/MediaUploader.apk proprietary
-adb pull /system/app/NetworkLocation.apk proprietary
-adb pull /system/app/OneTimeInitializer.apk proprietary
-adb pull /system/app/PassionQuickOffice.apk proprietary
-adb pull /system/app/SetupWizard.apk proprietary
-adb pull /system/app/Street.apk proprietary
-adb pull /system/app/Talk.apk proprietary
-adb pull /system/app/Twitter.apk proprietary
-adb pull /system/app/Vending.apk proprietary
-adb pull /system/app/VoiceSearch.apk proprietary
-adb pull /system/app/YouTube.apk proprietary
-adb pull /system/app/googlevoice.apk proprietary
-adb pull /system/app/kickback.apk proprietary
-adb pull /system/app/soundback.apk proprietary
-adb pull /system/app/talkback.apk proprietary
-adb pull /system/etc/permissions/com.google.android.maps.xml proprietary
-adb pull /system/etc/permissions/features.xml proprietary
-adb pull /system/framework/com.google.android.maps.jar proprietary
-adb pull /system/lib/libspeech.so proprietary
-
diff --git a/get-google-files b/get-google-files
deleted file mode 100755
index eb8ab53..0000000
--- a/get-google-files
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python
-import sys, random, urllib2, zipfile, StringIO, os
-from optparse import OptionParser
-
-FILENAME=["gapps-hdpi-20101114-signed.zip","gapps-mdpi-20101020-signed.zip","gapps-mdpi-tiny-20101020-signed.zip"]
-VERSIONS=["hdpi","mdpi","mdpi-tiny"]
-MIRRORS=["http://cyanogenmod-mirror.local.host.name/gapps/","http://goo-inside.me/google-apps/","http://android.d3xt3r01.tk/cyanogen/gapps/"]
-
-def device():
-    print "usage: get-google-files -m [method] -v [version]"
-    print "Note:  Device method is currently not implemented, please use download"
-    sys.exit(1)
-
-def download(version):
-    try:
-        os.makedirs(os.path.join(os.path.dirname(__file__), "proprietary"))
-    except:
-        pass
-    if len(MIRRORS) > 1:
-        i = random.randrange(0, len(MIRRORS)-1)
-    else:
-        i = 0
-
-    try:
-        j = VERSIONS.index(version.lower())
-    except ValueError:
-	print "GApps version not found, defaulting to HDPI"
-        j = 0
-
-    url = MIRRORS[i] + FILENAME[j]
-
-    print "Fetching %s GApps from %s" % (version.upper(),url)
-
-    data = urllib2.urlopen(url).read()
-    zip = zipfile.ZipFile(StringIO.StringIO(data),'r')
-    
-    for filename in zip.namelist():
-        if filename.split("/")[0] == "system" and filename[-1] != "/":
-            print "Extracting %s" % filename
-            try:
-                bytes = zip.read(filename)
-                fd = open(os.path.join(os.path.dirname(__file__), "proprietary", os.path.basename(filename)),"wb")
-                fd.write(bytes)
-                fd.close()
-            except Exception, e:
-                print e
-                pass
-
-def main():
-    parser = OptionParser(usage="usage: %prog [options]")
-    parser.add_option("-m", "--method", dest='method', default="download", help="Extraction Method: download")
-    parser.add_option("-v", "--version", dest='version', default="hdpi", help="GApps Version: hdpi, mdpi, mdpi-tiny [default: hdpi]")
-    (options, args) = parser.parse_args()
-
-    if options.method == "device":
-        return device()
-
-    if options.method == "download":
-        return download(options.version)
-
-if __name__ == '__main__':
-    main()
diff --git a/get-rommanager b/get-rommanager
deleted file mode 100755
index deee16e..0000000
--- a/get-rommanager
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p `dirname $0`/proprietary
-curl -o `dirname $0`/proprietary/RomManager.apk -O http://koush.tandtgaming.com/recoveries/RomManager.apk
diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 21f3167..05feba1 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -17,5 +17,6 @@
  */
 -->
 <resources>
+    <bool name="def_install_non_market_apps">true</bool>
     <string name="def_backup_transport">com.google.android.backup/.BackupTransportService</string>
 </resources>
diff --git a/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml b/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml
index a363a8e..5b9c9b4 100644
--- a/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml
+++ b/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml
@@ -80,8 +80,8 @@
         launcher:y="3" />
 
     <favorite
-        launcher:packageName="com.google.android.apps.maps"
-        launcher:className="com.google.android.maps.MapsActivity"
+        launcher:packageName="org.fdroid.fdroid"
+        launcher:className="org.fdroid.fdroid.FDroid"
         launcher:screen="2"
         launcher:x="3"
         launcher:y="3" />
@@ -115,6 +115,7 @@
         launcher:y="2" />
 
     <!--  Right screen [3] -->
+    <!--
     <favorite
         launcher:packageName="com.google.android.gm"
         launcher:className="com.google.android.gm.ConversationListActivityGmail"
@@ -128,4 +129,5 @@
         launcher:screen="3"
         launcher:x="2"
         launcher:y="3" />
+    -->
 </favorites>
diff --git a/overlay/passion/frameworks/base/core/res/res/values/config.xml b/overlay/passion/frameworks/base/core/res/res/values/config.xml
index d3b987e..5ecca97 100644
--- a/overlay/passion/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/passion/frameworks/base/core/res/res/values/config.xml
@@ -23,6 +23,8 @@
 
     <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
          specified -->
+    <!--
     <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
+    -->
 
 </resources>
diff --git a/prebuilt/common/lib/libncurses.so b/prebuilt/common/lib/libncurses.so
deleted file mode 100644
index 0e3d431..0000000
--- a/prebuilt/common/lib/libncurses.so
+++ /dev/null
diff --git a/prebuilt/common/xbin/bash b/prebuilt/common/xbin/bash
deleted file mode 100755
index 9d9f572..0000000
--- a/prebuilt/common/xbin/bash
+++ /dev/null
diff --git a/prebuilt/common/xbin/nano b/prebuilt/common/xbin/nano
deleted file mode 100755
index 67dc091..0000000
--- a/prebuilt/common/xbin/nano
+++ /dev/null
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index dc80c13..183a2f5 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -1,21 +1,21 @@
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/cyanogen_ace.mk \
-    $(LOCAL_DIR)/cyanogen_bravo.mk \
-    $(LOCAL_DIR)/cyanogen_bravoc.mk \
-    $(LOCAL_DIR)/cyanogen_buzz.mk \
-    $(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
-    $(LOCAL_DIR)/cyanogen_espresso.mk \
-    $(LOCAL_DIR)/cyanogen_glacier.mk \
-    $(LOCAL_DIR)/cyanogen_harmony.mk \
-    $(LOCAL_DIR)/cyanogen_hero.mk \
-    $(LOCAL_DIR)/cyanogen_heroc.mk \
-    $(LOCAL_DIR)/cyanogen_inc.mk \
-    $(LOCAL_DIR)/cyanogen_legend.mk \
-    $(LOCAL_DIR)/cyanogen_liberty.mk \
-    $(LOCAL_DIR)/cyanogen_one.mk \
-    $(LOCAL_DIR)/cyanogen_passion.mk \
-    $(LOCAL_DIR)/cyanogen_sholes.mk \
-    $(LOCAL_DIR)/cyanogen_supersonic.mk \
-    $(LOCAL_DIR)/cyanogen_vibrant.mk \
-    $(LOCAL_DIR)/cyanogen_vision.mk \
-    $(LOCAL_DIR)/cyanogen_z71.mk
+    $(LOCAL_DIR)/replicant_ace.mk \
+    $(LOCAL_DIR)/replicant_bravo.mk \
+    $(LOCAL_DIR)/replicant_bravoc.mk \
+    $(LOCAL_DIR)/replicant_buzz.mk \
+    $(LOCAL_DIR)/replicant_dream_sapphire.mk \
+    $(LOCAL_DIR)/replicant_espresso.mk \
+    $(LOCAL_DIR)/replicant_glacier.mk \
+    $(LOCAL_DIR)/replicant_harmony.mk \
+    $(LOCAL_DIR)/replicant_hero.mk \
+    $(LOCAL_DIR)/replicant_heroc.mk \
+    $(LOCAL_DIR)/replicant_inc.mk \
+    $(LOCAL_DIR)/replicant_legend.mk \
+    $(LOCAL_DIR)/replicant_liberty.mk \
+    $(LOCAL_DIR)/replicant_one.mk \
+    $(LOCAL_DIR)/replicant_passion.mk \
+    $(LOCAL_DIR)/replicant_sholes.mk \
+    $(LOCAL_DIR)/replicant_supersonic.mk \
+    $(LOCAL_DIR)/replicant_vibrant.mk \
+    $(LOCAL_DIR)/replicant_vision.mk \
+    $(LOCAL_DIR)/replicant_z71.mk
diff --git a/products/common.mk b/products/common.mk
index c0b93d9..33a47b0 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -1,21 +1,25 @@
-# Generic cyanogenmod product
-PRODUCT_NAME := cyanogen
-PRODUCT_BRAND := cyanogen
+# Generic replicant/replicant product
+PRODUCT_NAME := replicant
+PRODUCT_BRAND := replicant
 PRODUCT_DEVICE := generic
 
 PRODUCT_PACKAGES += ADWLauncher
 
+# Packages to include in Replicant
+PRODUCT_PACKAGES += ReplicantWallpapers
+PRODUCT_PACKAGES += FDroid
+
 # Add ROMManager build property
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.ringtone=DonMessWivIt.ogg
 
-ifdef CYANOGEN_NIGHTLY
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.rommanager.developerid=cyanogenmodnightly
-else
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.rommanager.developerid=cyanogenmod
-endif
+#ifdef CYANOGEN_NIGHTLY
+#PRODUCT_PROPERTY_OVERRIDES += \
+#    ro.rommanager.developerid=cyanogenmodnightly
+#else
+#PRODUCT_PROPERTY_OVERRIDES += \
+#    ro.rommanager.developerid=cyanogenmod
+#endif
 
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
 
@@ -41,96 +45,56 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
     CMParts \
     CMPartsHelper \
-    CMStats \
-    CMUpdateNotify \
-    CMWallpapers \
     DSPManager \
     FileManager \
     Superuser
+#    CMWallpapers \
+#    CMStats \
+#    CMUpdateNotify \
 
 # Copy over the changelog to the device
 PRODUCT_COPY_FILES += \
-    vendor/cyanogen/CHANGELOG.mkdn:system/etc/CHANGELOG-CM.txt
+    vendor/replicant/CHANGELOG.mkdn:system/etc/CHANGELOG-CM.txt
 
-# Common CM overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/common
+# Common CM/Replicant overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/replicant/overlay/common
 
 # Bring in some audio files
 include frameworks/base/data/sounds/AudioPackage4.mk
 
 PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \
-    vendor/cyanogen/prebuilt/common/bin/verify_cache_partition_size.sh:system/bin/verify_cache_partition_size.sh \
-    vendor/cyanogen/prebuilt/common/etc/resolv.conf:system/etc/resolv.conf \
-    vendor/cyanogen/prebuilt/common/etc/sysctl.conf:system/etc/sysctl.conf \
-    vendor/cyanogen/prebuilt/common/etc/terminfo/l/linux:system/etc/terminfo/l/linux \
-    vendor/cyanogen/prebuilt/common/etc/terminfo/u/unknown:system/etc/terminfo/u/unknown \
-    vendor/cyanogen/prebuilt/common/etc/profile:system/etc/profile \
-    vendor/cyanogen/prebuilt/common/etc/init.local.rc:system/etc/init.local.rc \
-    vendor/cyanogen/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner \
-    vendor/cyanogen/prebuilt/common/etc/init.d/01sysctl:system/etc/init.d/01sysctl \
-    vendor/cyanogen/prebuilt/common/etc/init.d/03firstboot:system/etc/init.d/03firstboot \
-    vendor/cyanogen/prebuilt/common/etc/init.d/04modules:system/etc/init.d/04modules \
-    vendor/cyanogen/prebuilt/common/etc/init.d/20userinit:system/etc/init.d/20userinit \
-    vendor/cyanogen/prebuilt/common/bin/handle_compcache:system/bin/handle_compcache \
-    vendor/cyanogen/prebuilt/common/bin/compcache:system/bin/compcache \
-    vendor/cyanogen/prebuilt/common/bin/fix_permissions:system/bin/fix_permissions \
-    vendor/cyanogen/prebuilt/common/bin/sysinit:system/bin/sysinit \
-    vendor/cyanogen/prebuilt/common/xbin/htop:system/xbin/htop \
-    vendor/cyanogen/prebuilt/common/xbin/irssi:system/xbin/irssi \
-    vendor/cyanogen/prebuilt/common/xbin/lsof:system/xbin/lsof \
-    vendor/cyanogen/prebuilt/common/xbin/powertop:system/xbin/powertop \
-    vendor/cyanogen/prebuilt/common/xbin/openvpn-up.sh:system/xbin/openvpn-up.sh
+    vendor/replicant/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \
+    vendor/replicant/prebuilt/common/bin/verify_cache_partition_size.sh:system/bin/verify_cache_partition_size.sh \
+    vendor/replicant/prebuilt/common/etc/resolv.conf:system/etc/resolv.conf \
+    vendor/replicant/prebuilt/common/etc/sysctl.conf:system/etc/sysctl.conf \
+    vendor/replicant/prebuilt/common/etc/terminfo/l/linux:system/etc/terminfo/l/linux \
+    vendor/replicant/prebuilt/common/etc/terminfo/u/unknown:system/etc/terminfo/u/unknown \
+    vendor/replicant/prebuilt/common/etc/profile:system/etc/profile \
+    vendor/replicant/prebuilt/common/etc/init.local.rc:system/etc/init.local.rc \
+    vendor/replicant/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner \
+    vendor/replicant/prebuilt/common/etc/init.d/01sysctl:system/etc/init.d/01sysctl \
+    vendor/replicant/prebuilt/common/etc/init.d/03firstboot:system/etc/init.d/03firstboot \
+    vendor/replicant/prebuilt/common/etc/init.d/04modules:system/etc/init.d/04modules \
+    vendor/replicant/prebuilt/common/etc/init.d/20userinit:system/etc/init.d/20userinit \
+    vendor/replicant/prebuilt/common/bin/handle_compcache:system/bin/handle_compcache \
+    vendor/replicant/prebuilt/common/bin/compcache:system/bin/compcache \
+    vendor/replicant/prebuilt/common/bin/fix_permissions:system/bin/fix_permissions \
+    vendor/replicant/prebuilt/common/bin/sysinit:system/bin/sysinit \
+    vendor/replicant/prebuilt/common/xbin/htop:system/xbin/htop \
+    vendor/replicant/prebuilt/common/xbin/irssi:system/xbin/irssi \
+    vendor/replicant/prebuilt/common/xbin/lsof:system/xbin/lsof \
+    vendor/replicant/prebuilt/common/xbin/powertop:system/xbin/powertop \
+    vendor/replicant/prebuilt/common/xbin/openvpn-up.sh:system/xbin/openvpn-up.sh
 
 PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/common/etc/init.d/05mountsd:system/etc/init.d/05mountsd
-#    vendor/cyanogen/prebuilt/common/etc/init.d/10apps2sd:system/etc/init.d/10apps2sd
+    vendor/replicant/prebuilt/common/etc/init.d/05mountsd:system/etc/init.d/05mountsd
+#    vendor/replicant/prebuilt/common/etc/init.d/10apps2sd:system/etc/init.d/10apps2sd
 
 # Always run in insecure mode, enables root on user build variants
-#ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0
-
-ifdef CYANOGEN_WITH_GOOGLE
-    PRODUCT_COPY_FILES += \
-        vendor/cyanogen/proprietary/CarHomeGoogle.apk:./system/app/CarHomeGoogle.apk \
-        vendor/cyanogen/proprietary/CarHomeLauncher.apk:./system/app/CarHomeLauncher.apk \
-        vendor/cyanogen/proprietary/Facebook.apk:./system/app/Facebook.apk \
-        vendor/cyanogen/proprietary/GenieWidget.apk:./system/app/GenieWidget.apk \
-        vendor/cyanogen/proprietary/Gmail.apk:./system/app/Gmail.apk \
-        vendor/cyanogen/proprietary/GoogleBackupTransport.apk:./system/app/GoogleBackupTransport.apk \
-        vendor/cyanogen/proprietary/GoogleCalendarSyncAdapter.apk:./system/app/GoogleCalendarSyncAdapter.apk \
-        vendor/cyanogen/proprietary/GoogleContactsSyncAdapter.apk:./system/app/GoogleContactsSyncAdapter.apk \
-        vendor/cyanogen/proprietary/GoogleFeedback.apk:./system/app/GoogleFeedback.apk \
-        vendor/cyanogen/proprietary/GooglePartnerSetup.apk:./system/app/GooglePartnerSetup.apk \
-        vendor/cyanogen/proprietary/GoogleQuickSearchBox.apk:./system/app/GoogleQuickSearchBox.apk \
-        vendor/cyanogen/proprietary/GoogleServicesFramework.apk:./system/app/GoogleServicesFramework.apk \
-        vendor/cyanogen/proprietary/HtcCopyright.apk:./system/app/HtcCopyright.apk \
-        vendor/cyanogen/proprietary/HtcEmailPolicy.apk:./system/app/HtcEmailPolicy.apk \
-        vendor/cyanogen/proprietary/HtcSettings.apk:./system/app/HtcSettings.apk \
-        vendor/cyanogen/proprietary/LatinImeTutorial.apk:./system/app/LatinImeTutorial.apk \
-        vendor/cyanogen/proprietary/Maps.apk:./system/app/Maps.apk \
-        vendor/cyanogen/proprietary/MarketUpdater.apk:./system/app/MarketUpdater.apk \
-        vendor/cyanogen/proprietary/MediaUploader.apk:./system/app/MediaUploader.apk \
-        vendor/cyanogen/proprietary/NetworkLocation.apk:./system/app/NetworkLocation.apk \
-        vendor/cyanogen/proprietary/OneTimeInitializer.apk:./system/app/OneTimeInitializer.apk \
-        vendor/cyanogen/proprietary/PassionQuickOffice.apk:./system/app/PassionQuickOffice.apk \
-        vendor/cyanogen/proprietary/SetupWizard.apk:./system/app/SetupWizard.apk \
-        vendor/cyanogen/proprietary/Street.apk:./system/app/Street.apk \
-        vendor/cyanogen/proprietary/Talk.apk:./system/app/Talk.apk \
-        vendor/cyanogen/proprietary/Twitter.apk:./system/app/Twitter.apk \
-        vendor/cyanogen/proprietary/Vending.apk:./system/app/Vending.apk \
-        vendor/cyanogen/proprietary/VoiceSearch.apk:./system/app/VoiceSearch.apk \
-        vendor/cyanogen/proprietary/YouTube.apk:./system/app/YouTube.apk \
-        vendor/cyanogen/proprietary/googlevoice.apk:./system/app/googlevoice.apk \
-        vendor/cyanogen/proprietary/kickback.apk:./system/app/kickback.apk \
-        vendor/cyanogen/proprietary/soundback.apk:./system/app/soundback.apk \
-        vendor/cyanogen/proprietary/talkback.apk:./system/app/talkback.apk \
-        vendor/cyanogen/proprietary/com.google.android.maps.xml:./system/etc/permissions/com.google.android.maps.xml \
-        vendor/cyanogen/proprietary/features.xml:./system/etc/permissions/features.xml \
-        vendor/cyanogen/proprietary/com.google.android.maps.jar:./system/framework/com.google.android.maps.jar \
-        vendor/cyanogen/proprietary/libspeech.so:./system/lib/libspeech.so
-else
-    PRODUCT_PACKAGES += \
-        Provision \
-        GoogleSearch \
-        LatinIME
-endif
+ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0
+
+PRODUCT_PACKAGES += \
+    Provision \
+    GoogleSearch \
+    LatinIME
+
diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
deleted file mode 100644
index abf3c13..0000000
--- a/products/cyanogen_ace.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Inherit device configuration for ace.
-$(call inherit-product, device/htc/ace/ace.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_ace
-PRODUCT_BRAND := htc_wwe
-PRODUCT_DEVICE := ace
-PRODUCT_MODEL := Desire HD
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_ace BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=htc_wwe/htc_ace/ace/ace:2.2/FRF91/278359:user/release-keys PRIVATE_BUILD_DESC="1.32.405.6 CL278359 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_ace_defconfig
-
-# Include the Torch and FM apps
-PRODUCT_PACKAGES += \
-    Torch \
-    FM    
-
-# Extra Vision overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ace
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-DesireHD
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-DesireHD
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
deleted file mode 100644
index 21120bf..0000000
--- a/products/cyanogen_bravo.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# Inherit AOSP device configuration for bravo.
-$(call inherit-product, device/htc/bravo/full_bravo.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_bravo
-PRODUCT_BRAND := htc_wwe
-PRODUCT_DEVICE := bravo
-PRODUCT_MODEL := HTC Desire
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRG83 PRODUCT_NAME=htc_bravo BUILD_FINGERPRINT=htc_wwe/htc_bravo/bravo/bravo:2.2/FRF91/226611:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="2.10.405.2 CL226611 release-keys"
-
-# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_bravo_defconfig
-
-# Include the Torch and FM apps
-PRODUCT_PACKAGES += \
-    Torch \
-    FM
-
-# Extra Bravo (CDMA/GSM) overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bravo
-
-# 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
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Desire
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Desire
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk
deleted file mode 100644
index c92d738..0000000
--- a/products/cyanogen_bravoc.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# Inherit AOSP device configuration for bravoc.
-$(call inherit-product, device/htc/bravoc/full_bravoc.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_bravoc
-PRODUCT_BRAND := us_cellular_wwe
-PRODUCT_DEVICE := bravoc
-PRODUCT_MODEL := HTC Desire CDMA
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRG83 PRODUCT_NAME=htc_bravo BUILD_FINGERPRINT=htc_wwe/htc_bravo/bravo/bravo:2.2/FRF91/226611:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="2.10.405.2 CL226611 release-keys"
-
-# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_bravoc_defconfig
-
-# Include the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Extra Bravo (CDMA/GSM) overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bravo
-
-# Enable Windows Media
-WITH_WINDOWS_MEDIA := true
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-BravoC
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-BravoC
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk
deleted file mode 100644
index 87327e9..0000000
--- a/products/cyanogen_buzz.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# Inherit AOSP device configuration for buzz.
-$(call inherit-product, device/htc/buzz/full_buzz.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-buzz
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_buzz
-PRODUCT_BRAND := htc_wwe
-PRODUCT_DEVICE := buzz
-PRODUCT_MODEL := HTC Wildfire
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
-
-# Include the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Extra Passion overlay
-PRODUCT_PACKAGE_OVERLAYS += device/htc/buzz/overlay
-
-# 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
-
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-buzz
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-buzz
-endif
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
deleted file mode 100644
index 51a2528..0000000
--- a/products/cyanogen_dream_sapphire.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# Inherit AOSP device configuration for dream_sapphire.
-$(call inherit-product, device/htc/dream_sapphire/full_dream_sapphire.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM-only stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_dream_sapphire
-PRODUCT_BRAND := google
-PRODUCT_DEVICE := dream_sapphire
-PRODUCT_MODEL := Dream/Sapphire
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=tmobile/opal/sapphire/sapphire:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="opal-user 2.2.1 FRG83 60505 release-keys"
-
-# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_msm_defconfig
-
-# Extra DS overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dream_sapphire
-
-# This file is used to install the correct audio profile when booted
-PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/dream_sapphire/etc/init.d/02audio_profile:system/etc/init.d/02audio_profile
-
-# Enable Compcache by default on D/S
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.compcache.default=18
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-DS
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-DS
-endif
-
-# Use the audio profile hack
-WITH_DS_HTCACOUSTIC_HACK := true
-
-#
-# Copy DS specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip \
-    vendor/cyanogen/prebuilt/dream_sapphire/etc/AudioPara_dream.csv:system/etc/AudioPara_dream.csv \
-    vendor/cyanogen/prebuilt/dream_sapphire/etc/AudioPara_sapphire.csv:system/etc/AudioPara_sapphire.csv
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
deleted file mode 100644
index 28bd3c4..0000000
--- a/products/cyanogen_espresso.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Inherit AOSP device configuration for espresso.
-$(call inherit-product, device/htc/espresso/espresso.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_espresso
-PRODUCT_BRAND := tmobile
-PRODUCT_DEVICE := espresso
-PRODUCT_MODEL := T-Mobile myTouch 3G Slide
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 PRODUCT_NAME=htc_espresso BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
-
-PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-espresso.map
-
-# Extra Espresso overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/espresso
-
-# Include the Torch app
-PRODUCT_PACKAGES += Torch
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Slide
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Slide
-endif
-
-#
-# Copy espresso specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_glacier.mk b/products/cyanogen_glacier.mk
deleted file mode 100644
index 002789a..0000000
--- a/products/cyanogen_glacier.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# Inherit device configuration for glacier.
-$(call inherit-product, device/htc/glacier/glacier.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_glacier
-PRODUCT_BRAND := tmobile
-PRODUCT_DEVICE := glacier
-PRODUCT_MODEL := HTC Glacier
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_glacier BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=tmobile/htc_glacier/glacier/glacier:2.2.1/FRG83/277036:user/release-keys PRIVATE_BUILD_DESC="1.17.531.2 CL277036 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_glacier_defconfig
-
-# Include the Torch app
-PRODUCT_PACKAGES += Torch FM
-
-# Extra glacier overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/glacier
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-glacier
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-glacier
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_harmony.mk b/products/cyanogen_harmony.mk
deleted file mode 100644
index 68b19f4..0000000
--- a/products/cyanogen_harmony.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-$(call inherit-product, device/nvidia/harmony/device_harmony.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_harmony
-PRODUCT_BRAND := nvidia
-PRODUCT_DEVICE := harmony
-PRODUCT_MODEL := GTablet
-PRODUCT_MANUFACTURER := malata
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=harmony BUILD_FINGERPRINT=Flextronics/harmony/harmony/:2.2/FRF91/hudson-20101122-122046-TnT_SVN_2967:user/test-keys PRODUCT_BRAND=Flextronics TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=test-keys PRIVATE_BUILD_DESC="harmony-user 2.2 FRF91 hudson-20101122-122046-TnT_SVN_2967 test-keys" PRODUCT_MODEL=UPC300-2.2 PRODUCT_MANUFACTURER=malata
-
-# Extra overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/harmony
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Harmony
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Harmony
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk
deleted file mode 100644
index c93ce28..0000000
--- a/products/cyanogen_hero.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Inherit AOSP device configuration for passion.
-$(call inherit-product, device/htc/hero/full_hero.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_hero
-PRODUCT_BRAND := htc
-PRODUCT_DEVICE := hero
-PRODUCT_MODEL := Hero
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
-
-PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-hero.map
-
-# Enable Windows Media
-WITH_WINDOWS_MEDIA := true
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Hero
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Hero
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
deleted file mode 100644
index c11833d..0000000
--- a/products/cyanogen_heroc.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# Inherit AOSP device configuration for heroc.
-$(call inherit-product, device/htc/heroc/heroc.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_heroc
-PRODUCT_BRAND := sprint
-PRODUCT_DEVICE := heroc
-PRODUCT_MODEL := HERO200
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
-
-# Extra overlay for Gallery3D orientation hack
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/heroc
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Heroc
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-	 ro.modversion=CyanogenMod-6.2.0-RC0-Heroc
-endif
-
-#
-# Copy dream/sapphire specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
deleted file mode 100644
index 80d9b99..0000000
--- a/products/cyanogen_inc.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-$(call inherit-product, device/htc/inc/inc.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_inc
-PRODUCT_BRAND := htc
-PRODUCT_DEVICE := inc
-PRODUCT_MODEL := Incredible
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRG83 PRODUCT_NAME=inc BUILD_FINGERPRINT=verizon_wwe/inc/inc/inc:2.2/FRF91/264707:user/release-keys PRODUCT_BRAND=verizon_wwe TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.26.605.1 CL264707 release-keys" PRODUCT_MODEL=ADR6300 PRODUCT_MANUFACTURER=HTC
-
-PRODUCT_PROPERTY_OVERRIDES += ro.product.version=3.26.605.1
-
-# Extra Passion overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/inc
-
-# Include the FM Radio
-PRODUCT_PACKAGES += FM
-# Include the Flashlight/Torch
-PRODUCT_PACKAGES += Torch
-
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Inc
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Inc
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_legend.mk b/products/cyanogen_legend.mk
deleted file mode 100644
index 38227e1..0000000
--- a/products/cyanogen_legend.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Inherit AOSP device configuration for legend.
-$(call inherit-product, device/htc/legend/legend.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_legend
-PRODUCT_BRAND := htc
-PRODUCT_DEVICE := legend
-PRODUCT_MODEL := Legend
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_legend BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
-
-PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-legend.map
-
-# Include the Torch app
-PRODUCT_PACKAGES += Torch
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Legend
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Legend
-endif
-
-#
-# Copy legend specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
deleted file mode 100644
index 494a8c9..0000000
--- a/products/cyanogen_liberty.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# Inherit AOSP device configuration for liberty.
-$(call inherit-product, device/htc/liberty/liberty.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_liberty
-PRODUCT_BRAND := htc
-PRODUCT_DEVICE := liberty
-PRODUCT_MODEL := Liberty
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_liberty BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
-
-PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-liberty.map
-
-#PRODUCT_PACKAGES += FM
-
-
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Liberty
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Liberty
-endif
-
-#
-# Copy liberty specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_one.mk b/products/cyanogen_one.mk
deleted file mode 100644
index c9412ae..0000000
--- a/products/cyanogen_one.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Inherit AOSP device configuration for geeksphone one.
-$(call inherit-product, device/geeksphone/one/one.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_one
-PRODUCT_BRAND := geeksphone
-PRODUCT_DEVICE := one
-PRODUCT_MODEL := Geeksphone ONE
-PRODUCT_MANUFACTURER := Geeksphone
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=geeksphone-one PRODUCT_NAME=geeksphone_one BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
-
-#
-# Move dalvik cache to data partition where there is more room to solve startup problems
-#
-PRODUCT_PROPERTY_OVERRIDES += dalvik.vm.dexopt-data-only=1
-
-#
-# Set ro.modversion
-#
-
-
-
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-ONE
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-ONE
-endif
-
-#
-# Copy GPO specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
deleted file mode 100644
index 7477515..0000000
--- a/products/cyanogen_passion.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# Inherit AOSP device configuration for passion.
-$(call inherit-product, device/htc/passion/full_passion.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_passion
-PRODUCT_BRAND := google
-PRODUCT_DEVICE := passion
-PRODUCT_MODEL := Nexus One
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=FRG83D BUILD_DISPLAY_ID=FRG83D BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83D/75603:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83D 75603 release-keys"
-
-# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_mahimahi_defconfig
-
-# Include the Torch and FM apps
-PRODUCT_PACKAGES += \
-    Torch \
-    FM
-
-# Extra Passion overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/passion
-
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.enable.managed.roaming=1 \
-    ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
-    ro.ril.emc.mode=2
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-N1
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-N1
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
deleted file mode 100644
index a9a8f07..0000000
--- a/products/cyanogen_sholes.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Inherit AOSP device configuration for passion.
-$(call inherit-product, device/motorola/sholes/sholes.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_sholes
-PRODUCT_BRAND := motorola
-PRODUCT_DEVICE := sholes
-PRODUCT_MODEL := Droid
-PRODUCT_MANUFACTURER := Motorola
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Droid
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Droid
-endif
-
-PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG83D BUILD_DISPLAY_ID=FRG83D PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2.1/FRG83D/75603:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2.1 FRG83D 75603 release-keys" BUILD_NUMBER=75603 BUILD_UTC_DATE=1289367602 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build
-
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/sholes
-
-# Include the Flashlight/Torch
-PRODUCT_PACKAGES += Torch
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
deleted file mode 100644
index 7ea43b7..0000000
--- a/products/cyanogen_supersonic.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# Inherit AOSP device configuration for supersonic.
-$(call inherit-product, device/htc/supersonic/supersonic.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_supersonic
-PRODUCT_BRAND := sprint
-PRODUCT_DEVICE := supersonic
-PRODUCT_MODEL := PC36100
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRG83 PRODUCT_NAME=htc_supersonic BUILD_FINGERPRINT=sprint/htc_supersonic/supersonic/supersonic:2.2/FRF91/252548:user/release-keys PRIVATE_BUILD_DESC="3.29.651.5 CL252548 release-keys"
-
-# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_supersonic_defconfig
-
-# Extra Supersonic overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/supersonic
-
-# Include the FM and Torch apps
-PRODUCT_PACKAGES += \
-    Torch \
-    FM
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Supersonic
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Supersonic
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_vibrant.mk b/products/cyanogen_vibrant.mk
deleted file mode 100644
index b18db44..0000000
--- a/products/cyanogen_vibrant.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Inherit device configuration for Vibrant.
-$(call inherit-product, device/samsung/vibrant/full_vibrant.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_vibrant
-PRODUCT_BRAND := Samsung
-PRODUCT_DEVICE := SGH-T959
-PRODUCT_MODEL := SGH-T959
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SGH-T959 BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
-
-# Extra Vibrant overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vibrant
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Vibrant
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Vibrant
-endif
-
-#
-# Copy Vibrant specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_vision.mk b/products/cyanogen_vision.mk
deleted file mode 100644
index 53f316d..0000000
--- a/products/cyanogen_vision.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Inherit device configuration for vision.
-$(call inherit-product, device/htc/vision/vision.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_vision
-PRODUCT_BRAND := tmobile
-PRODUCT_DEVICE := vision
-PRODUCT_MODEL := HTC Vision
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vision BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=tmobile/htc_vision/vision/vision:2.2/FRF91/277427:user/release-keys PRIVATE_BUILD_DESC="1.22.531.8 CL277427 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_vision_defconfig
-
-# Include the Torch app
-PRODUCT_PACKAGES += \
-    Torch \
-    FM
-
-# Extra Vision overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vision
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-vision
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-vision
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_z71.mk b/products/cyanogen_z71.mk
deleted file mode 100644
index bdbea5a..0000000
--- a/products/cyanogen_z71.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# Inherit AOSP device configuration for z71.
-$(call inherit-product, device/commtiva/z71/device_z71.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_z71
-PRODUCT_BRAND := commtiva
-PRODUCT_DEVICE := z71
-PRODUCT_MODEL := Z71
-PRODUCT_MANUFACTURER := Commtiva
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=commtiva_z71 BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
-
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-z71.map
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Z71
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Z71
-endif
-
-#
-# Copy legend specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/gsm.mk b/products/gsm.mk
index d5e77b1..6ce26e7 100644
--- a/products/gsm.mk
+++ b/products/gsm.mk
@@ -1,6 +1,6 @@
 # GSM APN list
 PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
+    vendor/replicant/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
 
 # SIM Toolkit
 PRODUCT_PACKAGES += \
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 14f5c0e..7d3d3d0 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,22 +1,22 @@
-add_lunch_combo cyanogen_ace-eng
-add_lunch_combo cyanogen_bravo-eng
-add_lunch_combo cyanogen_bravoc-eng
-add_lunch_combo cyanogen_buzz-eng
-add_lunch_combo cyanogen_dream_sapphire-eng
-add_lunch_combo cyanogen_espresso-eng
-add_lunch_combo cyanogen_glacier-eng
-add_lunch_combo cyanogen_harmony-eng
-add_lunch_combo cyanogen_hero-eng
-add_lunch_combo cyanogen_heroc-eng
-add_lunch_combo cyanogen_inc-eng
-add_lunch_combo cyanogen_legend-eng
-add_lunch_combo cyanogen_liberty-eng
-add_lunch_combo cyanogen_one-eng
-add_lunch_combo cyanogen_passion-eng
-add_lunch_combo cyanogen_sholes-eng
-add_lunch_combo cyanogen_supersonic-eng
-add_lunch_combo cyanogen_vibrant-eng
-add_lunch_combo cyanogen_vision-eng
-add_lunch_combo cyanogen_z71-eng
+add_lunch_combo replicant_ace-eng
+add_lunch_combo replicant_bravo-eng
+add_lunch_combo replicant_bravoc-eng
+add_lunch_combo replicant_buzz-eng
+add_lunch_combo replicant_dream_sapphire-eng
+add_lunch_combo replicant_espresso-eng
+add_lunch_combo replicant_glacier-eng
+add_lunch_combo replicant_harmony-eng
+add_lunch_combo replicant_hero-eng
+add_lunch_combo replicant_heroc-eng
+add_lunch_combo replicant_inc-eng
+add_lunch_combo replicant_legend-eng
+add_lunch_combo replicant_liberty-eng
+add_lunch_combo replicant_one-eng
+add_lunch_combo replicant_passion-eng
+add_lunch_combo replicant_sholes-eng
+add_lunch_combo replicant_supersonic-eng
+add_lunch_combo replicant_vibrant-eng
+add_lunch_combo replicant_vision-eng
+add_lunch_combo replicant_z71-eng
 
-PATH=$PATH:$PWD/vendor/cyanogen/tools ; export PATH
+PATH=$PATH:$PWD/vendor/replicant/tools ; export PATH