diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-27 00:15:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-05-27 00:15:18 +0000 |
commit | 4860628b4d6a6835f751dbcdeb4ab04ab9a1b70a (patch) | |
tree | e178dbb0ad44659058dfe9a5370f035187b6b781 | |
parent | 340da28664499d02c055fd57ed97cb8da37b35a5 (diff) | |
parent | e36a1401731d8f6dd47a8dfb96dc11e370986651 (diff) | |
download | mksh-4860628b4d6a6835f751dbcdeb4ab04ab9a1b70a.tar.gz |
Merge "Snap for 10214594 from bc57fc9617d3200c52b210c6407afe4ac923fc3c to sdk-release" into sdk-release
-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", |