From 2526fef627901a0642817485748b03bd007e89db Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date: Sat, 29 Sep 2012 17:17:45 +0100
Subject: [PATCH] cm: Start bundling the updater

And remove the now-redundant ROM Manager

Change-Id: I7664f8a3c21b2a7dd817a68e8ff38f1f96c029cc
---
 config/common.mk | 4 ++--
 get-prebuilts    | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/config/common.mk b/config/common.mk
index 3a2e547e..1f69feb9 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -96,7 +96,6 @@ PRODUCT_COPY_FILES += \
     vendor/cm/prebuilt/common/bin/modelid_cfg.sh:system/bin/modelid_cfg.sh
 
 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
 
@@ -143,7 +142,8 @@ PRODUCT_PACKAGES += \
     libcyanogen-dsp \
     audio_effects.conf \
     CMWallpapers \
-    Apollo
+    Apollo \
+    CMUpdater
 
 # Extra tools in CM
 PRODUCT_PACKAGES += \
diff --git a/get-prebuilts b/get-prebuilts
index 1ea12fb8..1d9493f6 100755
--- a/get-prebuilts
+++ b/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