Merge "mksh: fix ulimit." am: bc57fc9617 am: 69f93583f3 am: ec9b7ce0da

Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945

Change-Id: I8356db8b4d242cefad1a52c10749262246189f8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2023-05-11 18:15:10 +00:00 committed by Automerger Merge Worker
commit e596627a3a

View file

@ -59,11 +59,11 @@ cc_defaults {
"-DMKSH_DONT_EMIT_IDSTRING",
"-DKSH_VERSIONNAME_VENDOR_EXT=\" Android\"",
// ...and the defines from Build.sh.
// ...and the defines from src/Rebuild.sh after running src/Build.sh.
"-DMKSH_BUILDSH",
"-D_GNU_SOURCE",
"-DSETUID_CAN_FAIL_WITH_EAGAIN",
"-DHAVE_STRING_POOLING=1",
"-DHAVE_STRING_POOLING=2",
"-DHAVE_ATTRIBUTE_BOUNDED=1",
"-DHAVE_ATTRIBUTE_FORMAT=1",
"-DHAVE_ATTRIBUTE_NORETURN=1",
@ -96,13 +96,14 @@ cc_defaults {
"-DHAVE_CAN_UCBINTS=1",
"-DHAVE_CAN_INT8TYPE=1",
"-DHAVE_CAN_UCBINT8=1",
"-DHAVE_RLIM_T=1",
"-DHAVE_SIG_T=1",
"-DHAVE_SYS_ERRLIST=0",
"-DHAVE_SYS_SIGNAME=1",
"-DHAVE_SYS_SIGLIST=1",
"-DHAVE_FLOCK=1",
"-DHAVE_LOCK_FCNTL=1",
"-DHAVE_RLIMIT=1",
"-DHAVE_RLIM_T=1",
"-DHAVE_GETRUSAGE=1",
"-DHAVE_GETSID=1",
"-DHAVE_GETTIMEOFDAY=1",
@ -119,12 +120,14 @@ cc_defaults {
"-DHAVE_SETRESUGID=1",
"-DHAVE_SETGROUPS=1",
"-DHAVE_STRERROR=1",
"-DHAVE_STRSIGNAL=0",
"-DHAVE_STRSIGNAL=1",
"-DHAVE_STRLCPY=1",
"-DHAVE_FLOCK_DECL=1",
"-DHAVE_REVOKE_DECL=1",
"-DHAVE_SYS_ERRLIST_DECL=0",
"-DHAVE_SYS_SIGLIST_DECL=1",
"-DHAVE_ST_MTIM=1",
"-DHAVE_ST_MTIMENSEC=0",
"-DHAVE_PERSISTENT_HISTORY=0",
"-DMKSH_BUILD_R=593",