Merge "Remove Term, su, and CMUpdater from user builds" into cm-10.2

This commit is contained in:
Ricardo Cerqueira 2013-10-19 08:46:32 +00:00 committed by Gerrit Code Review
commit 7c4a6effb1

View File

@ -70,8 +70,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
ro.com.android.dataroaming=false ro.com.android.dataroaming=false
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.build.selinux=1 \ ro.build.selinux=1
persist.sys.root_access=1
# Disable excessive dalvik debug messages # Disable excessive dalvik debug messages
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
@ -117,11 +116,6 @@ PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/bin/compcache:system/bin/compcache \ vendor/cm/prebuilt/common/bin/compcache:system/bin/compcache \
vendor/cm/prebuilt/common/bin/handle_compcache:system/bin/handle_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 # Bring in camera effects
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/media/LMprec_508.emd:system/media/LMprec_508.emd \ 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 += \ PRODUCT_PACKAGES += \
Development \ Development \
LatinIME \ LatinIME \
Superuser \ BluetoothExt
BluetoothExt \
su
# Optional CM packages # Optional CM packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -169,7 +161,6 @@ PRODUCT_PACKAGES += \
audio_effects.conf \ audio_effects.conf \
CMWallpapers \ CMWallpapers \
Apollo \ Apollo \
CMUpdater \
CMFileManager \ CMFileManager \
LockClock \ LockClock \
CMAccount CMAccount
@ -198,7 +189,14 @@ PRODUCT_PACKAGES += \
fsck.exfat \ fsck.exfat \
mkfs.exfat \ mkfs.exfat \
ntfsfix \ ntfsfix \
ntfs-3g ntfs-3g \
gdbserver \
micro_bench \
oprofiled \
procmem \
procrank \
sqlite3 \
strace
# Openssh # Openssh
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -214,6 +212,31 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
rsync 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 # easy way to extend to add more packages
-include vendor/extra/product.mk -include vendor/extra/product.mk