commit 69f93583f3214d48838fe2c211ae3e7b1ff2351c
author Elliott Hughes <enh@google.com> Thu May 11 16:51:11 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 11 16:51:11 2023 +0000
tree e178dbb0ad44659058dfe9a5370f035187b6b781
parent 958fc6491762a054afba568eae5d0fa416d657d1
parent bc57fc9617d3200c52b210c6407afe4ac923fc3c

Merge "mksh: fix ulimit." am: bc57fc9617

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

Change-Id: Ifea2c7e7105cbc6688738d5c39f9ad69761d3589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index a300947..ca930d0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -59,11 +59,11 @@
         "-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 @@
         "-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 @@
         "-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",