mksh: Fix default execshell issues

 * We need to set these defines for the entire build.

Change-Id: Ie5a8429b8e55dd9003a9135cd1a0bdb113508fb9

1 files changed, 8 insertions, 22 deletions

diff --git a/Android.mk b/Android.mk
index a1c3a41..7c2b9b5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,6 +45,12 @@ common_cflags += \
     -DHAVE_SYS_ERRLIST_DECL=0 -DHAVE_SYS_SIGLIST_DECL=1 \
     -DHAVE_PERSISTENT_HISTORY=0 -DMKSH_BUILD_R=506
 
+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)
@@ -55,30 +61,11 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
 
-# build a static library first
-include $(CLEAR_VARS)
-LOCAL_MODULE := libmksh
-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/misc.c src/shf.c \
-    src/syn.c src/tree.c src/var.c
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
-LOCAL_CFLAGS := $(common_cflags)
-LOCAL_CLANG := true
-include $(BUILD_STATIC_LIBRARY)
-
-
 # /system/bin/sh
 include $(CLEAR_VARS)
 LOCAL_MODULE := sh
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := src/main.c
-LOCAL_STATIC_LIBRARIES := libmksh
+LOCAL_SRC_FILES := $(common_src_files) src/main.c
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc
 LOCAL_CFLAGS := $(common_cflags)
 LOCAL_CFLAGS += \
@@ -93,8 +80,7 @@ include $(BUILD_EXECUTABLE)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libmksh_static
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := src/main.c
-LOCAL_WHOLE_STATIC_LIBRARIES := libmksh
+LOCAL_SRC_FILES := $(common_src_files) src/main.c
 LOCAL_CFLAGS := $(common_cflags)
 LOCAL_CFLAGS += -Dmain=mksh_main
 LOCAL_CFLAGS += \