Merge remote-tracking branch 'los/cm-14.1' into nougat-x86

diff --git a/Android.mk b/Android.mk
index 12f3c83..9a1ecc4 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,52 +4,15 @@
 
 LOCAL_PATH := $(call my-dir)
 
-
-# /system/etc/mkshrc
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := mkshrc
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-
-# /system/bin/sh
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := sh
-LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
-
-# mksh source files
-LOCAL_SRC_FILES := \
-    src/lalloc.c src/edit.c src/eval.c src/exec.c \
-    src/expr.c src/funcs.c src/histrap.c src/jobs.c \
-    src/lex.c src/main.c src/misc.c src/shf.c \
-    src/syn.c src/tree.c src/var.c
-
-LOCAL_SYSTEM_SHARED_LIBRARIES := libc
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
-
-# Additional flags first...
-LOCAL_CFLAGS += \
-    -DMKSH_DEFAULT_PROFILEDIR=\"/system/etc\" \
-    -DMKSHRC_PATH=\"/system/etc/mkshrc\" \
-    -DMKSH_DEFAULT_EXECSHELL=\"/system/bin/sh\" \
-    -DMKSH_DEFAULT_TMPDIR=\"/data/local\" \
-
 # ...then from Makefrag.inc: CFLAGS...
-LOCAL_CFLAGS += \
+common_cflags += \
     -Wno-deprecated-declarations \
     -fno-asynchronous-unwind-tables \
     -fno-strict-aliasing \
     -fstack-protector -fwrapv \
 
 # ...and CPPFLAGS.
-LOCAL_CFLAGS += \
+common_cflags += \
     -DDEBUG_LEAKS -DMKSH_ASSUME_UTF8 -DMKSH_CONSERVATIVE_FDS \
     -DMKSH_DONT_EMIT_IDSTRING -DMKSH_NOPWNAM -DMKSH_BUILDSH \
     -D_GNU_SOURCE -DSETUID_CAN_FAIL_WITH_EAGAIN \
@@ -82,4 +45,49 @@ LOCAL_CFLAGS += \
     -DHAVE_SYS_ERRLIST_DECL=0 -DHAVE_SYS_SIGLIST_DECL=1 \
     -DHAVE_PERSISTENT_HISTORY=0 -DMKSH_BUILD_R=521
 
+common_src_files := \
+    src/lalloc.c src/edit.c src/eval.c src/exec.c \
+    src/expr.c src/funcs.c src/histrap.c src/jobs.c \
+    src/lex.c src/misc.c src/shf.c \
+    src/syn.c src/tree.c src/var.c
+
+
+# /system/etc/mkshrc
+include $(CLEAR_VARS)
+LOCAL_MODULE := mkshrc
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT)/etc
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+
+# /system/bin/sh
+include $(CLEAR_VARS)
+LOCAL_MODULE := sh
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(common_src_files) src/main.c
+LOCAL_SYSTEM_SHARED_LIBRARIES := libc
+LOCAL_CFLAGS := $(common_cflags)
+LOCAL_CFLAGS += \
+    -DMKSH_DEFAULT_PROFILEDIR=\"/system/etc\" \
+    -DMKSHRC_PATH=\"/system/etc/mkshrc\" \
+    -DMKSH_DEFAULT_EXECSHELL=\"/system/bin/sh\" \
+    -DMKSH_DEFAULT_TMPDIR=\"/data/local\"
+LOCAL_CLANG := true
 include $(BUILD_EXECUTABLE)
+
+# recovery shell: /sbin/sh
+# this is built into a single-call binary
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmksh_static
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(common_src_files) src/main.c
+LOCAL_CFLAGS := $(common_cflags)
+LOCAL_CFLAGS += -Dmain=mksh_main
+LOCAL_CFLAGS += \
+    -DMKSH_DEFAULT_PROFILEDIR=\"/etc\" \
+    -DMKSHRC_PATH=\"/etc/mkshrc\" \
+    -DMKSH_DEFAULT_EXECSHELL=\"/sbin/sh\" \
+    -DMKSH_DEFAULT_TMPDIR=\"/tmp\"
+LOCAL_CLANG := true
+include $(BUILD_STATIC_LIBRARY)

diff --git a/mkshrc b/mkshrc
index 0b66e12..a86c8e9 100644 (file)
--- a/mkshrc
+++ b/mkshrc
@@ -6,6 +6,7 @@
 #
 # Support: https://launchpad.net/mksh
 
+: ${HOSTNAME:=$(getprop ro.cm.device)}
 : ${HOSTNAME:=$(getprop ro.product.device)}
 : ${HOSTNAME:=android}
 : ${TMPDIR:=/data/local/tmp}
@@ -24,3 +25,7 @@ PS4='[$EPOCHREALTIME] '; PS1='${|
 
        return $e
 }$HOSTNAME:${PWD:-?} '"$PS1 "
+
+if [ "z$ANDROID_SOCKET_adbd" != "z" ]; then
+   resize
+fi

diff --git a/src/dot.mkshrc b/src/dot.mkshrc
index ab13f9d..b582044 100644 (file)
--- a/src/dot.mkshrc
+++ b/src/dot.mkshrc
@@ -28,7 +28,7 @@ case ${KSH_VERSION:-} in
 *) return 0 ;;
 esac
 
-PS1='#'; (( USER_ID )) && PS1='$'; \: "${TERM:=vt100}${HOSTNAME:=$(\ulimit -c \
+PS1='#'; (( USER_ID )) && PS1='$'; \: "${TERM:=linux}${HOSTNAME:=$(\ulimit -c \
     0; hostname 2>/dev/null)}${EDITOR:=/bin/ed}${USER:=$(\ulimit -c 0; id -un \
     2>/dev/null || \echo \?)}${MKSH:=$(\builtin whence -p mksh)}"
 HOSTNAME=${HOSTNAME%%*([        ]).*}; HOSTNAME=${HOSTNAME##*([         ])}