From 772a0f6794d1650b0c6f8a5e1d523757c3a9450c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Wed, 18 May 2011 13:49:08 -0700 Subject: [PATCH] Switch to mksh as the default shell. Switch the emulator builds to ash to make sure it still works, in case we find that we need to go back to using ash. Change-Id: Id5641940b63cc4225011be1c375f4c86ec4d21cc --- core/config.mk | 4 ++-- target/board/generic/BoardConfig.mk | 4 ++-- target/board/generic_x86/BoardConfig.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/config.mk b/core/config.mk index 20a25824a..3240e946f 100644 --- a/core/config.mk +++ b/core/config.mk @@ -105,8 +105,8 @@ TARGET_ERROR_FLAGS := -Werror=return-type -Werror=non-virtual-dtor -Werror=addre # TODO: do symbol compression TARGET_COMPRESS_MODULE_SYMBOLS := false -# Default shell is ash. Other possible value is mksh. -TARGET_SHELL := ash +# Default shell is mksh. Other possible value is ash. +TARGET_SHELL := mksh # ############################################################### # Include sub-configuration files diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 26bf6ab12..2b05f79eb 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -13,5 +13,5 @@ BOARD_USES_GENERIC_AUDIO := true # no hardware camera USE_CAMERA_STUB := true -# Set /system/bin/sh to mksh, not ash, to test the transition. -TARGET_SHELL := mksh +# Set /system/bin/sh to ash, not mksh, to make sure we can switch back. +TARGET_SHELL := ash diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 75fc04061..72779089b 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -18,5 +18,5 @@ BOARD_USES_GENERIC_AUDIO := true # no hardware camera USE_CAMERA_STUB := true -# Set /system/bin/sh to mksh, not ash, to test the transition. -TARGET_SHELL := mksh +# Set /system/bin/sh to ash, not mksh, to make sure we can switch back. +TARGET_SHELL := ash -- 2.11.0