Merge "vendor/cm: Clean up init.local.rc" into cm-10.2
diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index 6313e46..0797213 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -85,6 +85,7 @@
* __Samsung Galaxy Tab 2 7" (GT-P31xx):__ codeworkx
* __Samsung Galaxy Tab 2 10.1" (GT-P51xx):__ codeworkx
* __Samsung Vibrant (SGH-T959):__ FaultException
+* __Sony Xperia SP (huashan):__ jerpelea, Kali- (FreeXperia team), adfad666, uberlaggydarwin
* __Sony Xperia T (mint):__ jerpelea, Kali- (FreeXperia team), codeworkx, cdesai, tilal6991
* __Sony Xperia V (tsubasa):__ jerpelea, Kali- (FreeXperia team), codeworkx, tilal6991, championswimmer
* __Sony Xperia Z (yuga):__ jerpelea, Kali- (FreeXperia team), cdesai, codeworkx, Entropy512, championswimmer
diff --git a/config/common.mk b/config/common.mk
index 038baa1..1b8a5e2 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -1,6 +1,5 @@
PRODUCT_BRAND ?= cyanogenmod
--include vendor/cm-priv/keys.mk
SUPERUSER_EMBEDDED := true
SUPERUSER_PACKAGE_PREFIX := com.android.settings.cyanogenmod.superuser
@@ -72,10 +71,6 @@
PRODUCT_PROPERTY_OVERRIDES += \
ro.build.selinux=1
-# Disable excessive dalvik debug messages
-PRODUCT_PROPERTY_OVERRIDES += \
- dalvik.vm.debug.alloc=0
-
ifneq ($(TARGET_BUILD_VARIANT),eng)
# Enable ADB authentication
ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1
@@ -133,10 +128,6 @@
PRODUCT_COPY_FILES += \
vendor/cm/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml
-# Don't export PS1 in /system/etc/mkshrc.
-PRODUCT_COPY_FILES += \
- vendor/cm/prebuilt/common/etc/mkshrc:system/etc/mkshrc
-
# T-Mobile theme engine
include vendor/cm/config/themes_common.mk
@@ -304,4 +295,7 @@
ro.modversion=$(CM_VERSION)
-include vendor/cm/sepolicy/sepolicy.mk
+
+-include vendor/cm-priv/keys/keys.mk
+
-include $(WORKSPACE)/hudson/image-auto-bits.mk
diff --git a/prebuilt/common/etc/mkshrc b/prebuilt/common/etc/mkshrc
deleted file mode 100644
index e2a55d3..0000000
--- a/prebuilt/common/etc/mkshrc
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2010
-# Thorsten Glaser <t.glaser@tarent.de>
-# This file is provided under the same terms as mksh.
-#-
-# Minimal /system/etc/mkshrc for Android
-
-: ${TERM:=vt100} ${HOME:=/data} ${MKSH:=/system/bin/sh} ${HOSTNAME:=android}
-: ${SHELL:=$MKSH} ${USER:=$(typeset x=$(id); x=${x#*\(}; print -r -- ${x%%\)*})}
-if (( USER_ID )); then PS1='$'; else PS1='#'; fi
-function precmd {
- typeset e=$?
-
- (( e )) && print -n "$e|"
-}
-PS1='$(precmd)$USER@$HOSTNAME:${PWD:-?} '"$PS1 "
-export HOME HOSTNAME MKSH SHELL TERM USER
-alias l='ls'
-alias la='l -a'
-alias ll='l -l'
-alias lo='l -a -l'
-
-for p in ~/.bin; do
- [[ -d $p/. ]] || continue
- [[ :$PATH: = *:$p:* ]] || PATH=$p:$PATH
-done
-
-unset p
-
-: place customisations above this line