From 178ca721b4bfc5286e2c79f510a4ab5dbbc89ead Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date: Wed, 13 Nov 2013 21:16:33 +0000
Subject: [PATCH] Always build the updaters

The separation logic is from signing key, not build type. Let
the app makefiles decide

Change-Id: I71286d83148454d77c5e8c35b8c25762ea2d34d3
---
 config/common.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/config/common.mk b/config/common.mk
index 15902fd1..0a5fc13e 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -164,6 +164,8 @@ PRODUCT_PACKAGES += \
     Apollo \
     CMFileManager \
     LockClock \
+    CMUpdater \
+    CMFota \
     CMAccount
 
 # CM Hardware Abstraction Framework
@@ -217,7 +219,6 @@ ifneq ($(TARGET_BUILD_VARIANT),user)
 PRODUCT_PACKAGES += \
     procmem \
     procrank \
-    CMUpdater \
     Superuser \
     su
 
@@ -230,9 +231,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.sys.root_access=1
 else
 
-PRODUCT_PACKAGES += \
-    CMFota
-
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.sys.root_access=0