Permalink
Browse files

Remove Term, su, and CMUpdater from user builds

Also, set the default root_access property to 0, and
explicitly add to the build packages tools we always
want, to avoid relying on PRODUCT_TAGS that may change
upstream

Change-Id: Iecfb8501cfb2f556d5cafe7d18d06539c0433839
  • Loading branch information...
1 parent 750430f commit 07d49dcf5eb995d25a3d502b7487f4eafdc137e8 @rmcc rmcc committed Sep 25, 2013
Showing with 34 additions and 10 deletions.
  1. +34 −10 config/common.mk
View
@@ -108,11 +108,6 @@ PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/bin/compcache:system/bin/compcache \
vendor/cm/prebuilt/common/bin/handle_compcache:system/bin/handle_compcache
-# Terminal Emulator
-PRODUCT_COPY_FILES += \
- vendor/cm/proprietary/Term.apk:system/app/Term.apk \
- vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so
-
# Bring in camera effects
PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
@@ -141,9 +136,7 @@ include vendor/cm/config/themes_common.mk
PRODUCT_PACKAGES += \
Camera \
Development \
- LatinIME \
- Superuser \
- su
+ LatinIME
# Optional CM packages
PRODUCT_PACKAGES += \
@@ -161,7 +154,6 @@ PRODUCT_PACKAGES += \
audio_effects.conf \
CMWallpapers \
Apollo \
- CMUpdater \
CMFileManager \
LockClock \
CMAccount
@@ -185,7 +177,14 @@ PRODUCT_PACKAGES += \
fsck.exfat \
mkfs.exfat \
ntfsfix \
- ntfs-3g
+ ntfs-3g \
+ gdbserver \
+ micro_bench \
+ oprofiled \
+ procmem \
+ procrank \
+ sqlite3 \
+ strace
# Openssh
PRODUCT_PACKAGES += \
@@ -201,6 +200,31 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
rsync
+# These packages are excluded from user builds
+ifneq ($(TARGET_BUILD_VARIANT),user)
+
+PRODUCT_PACKAGES += \
+ CMUpdater \
+ Superuser \
+ su
+
+# Terminal Emulator
+PRODUCT_COPY_FILES += \
+ vendor/cm/proprietary/Term.apk:system/app/Term.apk \
+ vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so
+
+PRODUCT_PROPERTY_OVERRIDES += \
+ persist.sys.root_access=1
+else
+
+PRODUCT_PACKAGES += \
+ CMFota
+
+PRODUCT_PROPERTY_OVERRIDES += \
+ persist.sys.root_access=0
+
+endif
+
PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/common

0 comments on commit 07d49dc

Please sign in to comment.