cm: Start bundling the updater

And remove the now-redundant ROM Manager

Change-Id: I7664f8a3c21b2a7dd817a68e8ff38f1f96c029cc

config/common.mk

@@ -51,7 +51,6 @@ PRODUCT_COPY_FILES += \
     vendor/cm/prebuilt/common/bin/handle_compcache:system/bin/handle_compcache
 
 PRODUCT_COPY_FILES +=  \
-    vendor/cm/proprietary/RomManager.apk:system/app/RomManager.apk \
     vendor/cm/proprietary/Term.apk:system/app/Term.apk \
     vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so \
 	vendor/cm/prebuilt/common/apps/Superuser.apk:system/app/Superuser.apk
@@ -106,7 +105,8 @@ PRODUCT_PACKAGES += \
     libcyanogen-dsp \
     audio_effects.conf \
     CMWallpapers \
-    Apollo
+    Apollo \
+    CMUpdater
 
 # Extra tools in CM
 PRODUCT_PACKAGES += \

get-prebuilts

@@ -3,9 +3,6 @@ BASEDIR=`dirname $0`
 
 mkdir -p $BASEDIR/proprietary
 
-# Get ROM Manager
-curl -L -o $BASEDIR/proprietary/RomManager.apk -O -L http://download.clockworkmod.com/recoveries/RomManager.apk
-
 # Get Android Terminal Emulator (we use a prebuilt so it can update from the Market)
 curl -L -o $BASEDIR/proprietary/Term.apk -O -L https://github.com/downloads/jackpal/Android-Terminal-Emulator/Term.apk
 unzip -o -d $BASEDIR/proprietary $BASEDIR/proprietary/Term.apk lib/armeabi/libjackpal-androidterm4.so