diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-25 09:54:23 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-25 09:54:23 -0700 |
| commit | 468f23ac2fa3db150b6c626417de44f5c0f17fa0 (patch) | |
| tree | 011243ada20daf9b05dd68bfd02f664141875100 /sh | |
| parent | bdcf98ddbf2022ef894dfd7f9278e6f345e2c2df (diff) | |
| parent | bdc36d641c2d557cc20b8cf044048f0a8c72e774 (diff) | |
| download | core-468f23ac2fa3db150b6c626417de44f5c0f17fa0.tar.gz core-468f23ac2fa3db150b6c626417de44f5c0f17fa0.tar.bz2 core-468f23ac2fa3db150b6c626417de44f5c0f17fa0.zip | |
Manual merge
Change-Id: I849703a709fe4bf9ea7181268221d9b648b2e73d
Diffstat (limited to 'sh')
| -rw-r--r-- | sh/Android.mk | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/sh/Android.mk b/sh/Android.mk index b5e5c38c5..dcd13d83a 100644 --- a/sh/Android.mk +++ b/sh/Android.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES:= \ bltin/echo.c \ init.c -LOCAL_MODULE:= sh +LOCAL_MODULE:= ash +LOCAL_MODULE_TAGS:= shell_ash LOCAL_CFLAGS += -DSHELL -DWITH_LINENOISE @@ -51,3 +52,19 @@ make_ash_files: sh ./mkinit.sh $(PRIVATE_SRC_FILES) include $(BUILD_EXECUTABLE) + + +# create /system/bin/sh symlink to $(TARGET_SHELL) +# not the optimal place for this, but a fitting one + +OUTSYSTEMBINSH := $(TARGET_OUT)/bin/sh +LOCAL_MODULE := systembinsh +$(OUTSYSTEMBINSH): | $(TARGET_SHELL) +$(OUTSYSTEMBINSH): LOCAL_MODULE := $(LOCAL_MODULE) +$(OUTSYSTEMBINSH): + @echo "Symlink: $@ -> $(TARGET_SHELL)" + @rm -rf $@ + $(hide) ln -sf $(TARGET_SHELL) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(OUTSYSTEMBINSH) +ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(OUTSYSTEMBINSH) |