From a21887e8785851b0a71b55551430fe0ae6d76f8c Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Wed, 25 Sep 2013 17:13:25 +0100 Subject: [PATCH] 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 --- config/common.mk | 47 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/config/common.mk b/config/common.mk index 9bb2fd50..038baa1a 100644 --- a/config/common.mk +++ b/config/common.mk @@ -70,8 +70,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.com.android.dataroaming=false PRODUCT_PROPERTY_OVERRIDES += \ - ro.build.selinux=1 \ - persist.sys.root_access=1 + ro.build.selinux=1 # Disable excessive dalvik debug messages PRODUCT_PROPERTY_OVERRIDES += \ @@ -117,11 +116,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 \ @@ -150,9 +144,7 @@ include vendor/cm/config/themes_common.mk PRODUCT_PACKAGES += \ Development \ LatinIME \ - Superuser \ - BluetoothExt \ - su + BluetoothExt # Optional CM packages PRODUCT_PACKAGES += \ @@ -169,7 +161,6 @@ PRODUCT_PACKAGES += \ audio_effects.conf \ CMWallpapers \ Apollo \ - CMUpdater \ CMFileManager \ LockClock \ CMAccount @@ -198,7 +189,14 @@ PRODUCT_PACKAGES += \ fsck.exfat \ mkfs.exfat \ ntfsfix \ - ntfs-3g + ntfs-3g \ + gdbserver \ + micro_bench \ + oprofiled \ + procmem \ + procrank \ + sqlite3 \ + strace # Openssh PRODUCT_PACKAGES += \ @@ -214,6 +212,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 + # easy way to extend to add more packages -include vendor/extra/product.mk