Merge "Disable various mksh builtins."

am: bf92a24781

Change-Id: I8de5f26b5b9c7fe338c9402bc5b39eb00bee90a7
This commit is contained in:
Elliott Hughes 2016-08-25 19:50:31 +00:00 committed by android-build-merger
commit 28c041f5a3

View file

@ -101,13 +101,17 @@ const struct builtin mkshbuiltins[] = {
{Talias, c_alias}, {Talias, c_alias},
{"*=break", c_brkcont}, {"*=break", c_brkcont},
{Tgbuiltin, c_builtin}, {Tgbuiltin, c_builtin},
#if !defined(__ANDROID__)
{Tbcat, c_cat}, {Tbcat, c_cat},
#endif
{Tcd, c_cd}, {Tcd, c_cd},
/* dash compatibility hack */ /* dash compatibility hack */
{"chdir", c_cd}, {"chdir", c_cd},
{Tcommand, c_command}, {Tcommand, c_command},
{"*=continue", c_brkcont}, {"*=continue", c_brkcont},
#if !defined(__ANDROID__)
{"echo", c_print}, {"echo", c_print},
#endif
{"*=eval", c_eval}, {"*=eval", c_eval},
{"*=exec", c_exec}, {"*=exec", c_exec},
{"*=exit", c_exitreturn}, {"*=exit", c_exitreturn},
@ -117,14 +121,20 @@ const struct builtin mkshbuiltins[] = {
{Tgetopts, c_getopts}, {Tgetopts, c_getopts},
{"=global", c_typeset}, {"=global", c_typeset},
{Tjobs, c_jobs}, {Tjobs, c_jobs},
#if !defined(__ANDROID__)
{"kill", c_kill}, {"kill", c_kill},
#endif
{"let", c_let}, {"let", c_let},
{"let]", c_let}, {"let]", c_let},
{"print", c_print}, {"print", c_print},
#if !defined(__ANDROID__)
{"pwd", c_pwd}, {"pwd", c_pwd},
#endif
{Tread, c_read}, {Tread, c_read},
{Tsgreadonly, c_typeset}, {Tsgreadonly, c_typeset},
#if !defined(__ANDROID__)
{"!realpath", c_realpath}, {"!realpath", c_realpath},
#endif
{"~rename", c_rename}, {"~rename", c_rename},
{"*=return", c_exitreturn}, {"*=return", c_exitreturn},
{Tsgset, c_set}, {Tsgset, c_set},
@ -138,7 +148,9 @@ const struct builtin mkshbuiltins[] = {
{"*=trap", c_trap}, {"*=trap", c_trap},
{Ttrue, c_true}, {Ttrue, c_true},
{Tgtypeset, c_typeset}, {Tgtypeset, c_typeset},
#if !defined(__ANDROID__)
{"ulimit", c_ulimit}, {"ulimit", c_ulimit},
#endif
{"umask", c_umask}, {"umask", c_umask},
{Tunalias, c_unalias}, {Tunalias, c_unalias},
{"*=unset", c_unset}, {"*=unset", c_unset},
@ -158,7 +170,9 @@ const struct builtin mkshbuiltins[] = {
{"~printf", c_printf}, {"~printf", c_printf},
#endif #endif
#if HAVE_SELECT #if HAVE_SELECT
# if !defined(__ANDROID__)
{"sleep", c_sleep}, {"sleep", c_sleep},
# endif
#endif #endif
#ifdef __MirBSD__ #ifdef __MirBSD__
/* alias to "true" for historical reasons */ /* alias to "true" for historical reasons */