diff options
| author | Elliott Hughes <enh@google.com> | 2023-05-10 15:53:25 -0700 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-05-11 16:07:20 +0000 |
| commit | 55d30846c5ec3174b47b81be2ded89d55d2d9829 (patch) | |
| tree | e178dbb0ad44659058dfe9a5370f035187b6b781 | |
| parent | 71a7c1787d458f91eed6348c807ed0af9446654f (diff) | |
| download | mksh-55d30846c5ec3174b47b81be2ded89d55d2d9829.tar.gz | |
mksh: fix ulimit.android14-dev
In the absence of the correct #define, mksh was falling back to a trivial
internal list of limits (that doubly annoyingly wasn't reflected in the
usage output).
Bug: http://b/281900697
Test: ulimit -a
(cherry picked from https://android-review.googlesource.com/q/commit:3c75470b2730985cfd83a4c0d83a3f7e81e7c2f8)
Merged-In: I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b
Change-Id: I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b
| -rw-r--r-- | Android.bp | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -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", |