diff options
author | Nick Kralevich <nnk@google.com> | 2013-02-20 20:08:35 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-20 20:08:35 +0000 |
commit | f8c396c4d446a038358106a301b329607a04633d (patch) | |
tree | e27b184e6daf7a91e6d1f9ae1fc549ec8abe6e0a | |
parent | d2cea5b5036afed5295d9eb5657772d7a607351c (diff) | |
parent | fd187c65783f5032a49eace50b115495b051cd73 (diff) | |
download | mksh-f8c396c4d446a038358106a301b329607a04633d.tar.gz |
Merge "mksh: use /data/local instead of /data/local/tmp"android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-dev-plus-aosp
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | mkmf.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -36,7 +36,7 @@ LOCAL_C_INCLUDES:= $(LOCAL_PATH)/src # additional flags first, then from Makefrag.inc: CFLAGS, CPPFLAGS LOCAL_CFLAGS:= -DMKSHRC_PATH=\"/system/etc/mkshrc\" \ -DMKSH_DEFAULT_EXECSHELL=\"/system/bin/sh\" \ - -DMKSH_DEFAULT_TMPDIR=\"/data/local/tmp\" \ + -DMKSH_DEFAULT_TMPDIR=\"/data/local\" \ -fno-asynchronous-unwind-tables -fwrapv \ -DDEBUG_LEAKS -DMKSH_ASSUME_UTF8 -DMKSH_CONSERVATIVE_FDS \ -DMKSH_DONT_EMIT_IDSTRING -DMKSH_NOPWNAM -DMKSH_BUILDSH \ @@ -149,7 +149,7 @@ addvar LIBS \ if test $mkmfmode = 1; then addvar CPPFLAGS '-DMKSHRC_PATH=\"/system/etc/mkshrc\"' addvar CPPFLAGS '-DMKSH_DEFAULT_EXECSHELL=\"/system/bin/sh\"' - addvar CPPFLAGS '-DMKSH_DEFAULT_TMPDIR=\"/data/local/tmp\"' + addvar CPPFLAGS '-DMKSH_DEFAULT_TMPDIR=\"/data/local\"' fi ### Override flags |