summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2014-02-19 08:26:07 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-19 08:26:07 -0800
commit96ddea413dcf266d996877d3fc2d81738c5316c8 (patch)
tree4d76bda1f3ad29f318145cdcf268828204529de0
parent7a4172d190871c6b17124bf86374304cef727984 (diff)
parent7c710936c5129664f8b23bf4592c12eca975d229 (diff)
am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime."
* commit '7c710936c5129664f8b23bf4592c12eca975d229': Remove java.io.tmpdir assignment in AndroidRuntime.
-rw-r--r--core/jni/AndroidRuntime.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 97ea5e625fde..b4599b653ca4 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -760,13 +760,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
mOptions.add(opt);
}
- /*
- * We don't have /tmp on the device, but we often have an SD card. Apps
- * shouldn't use this, but some test suites might want to exercise it.
- */
- opt.optionString = "-Djava.io.tmpdir=/sdcard";
- mOptions.add(opt);
-
initArgs.version = JNI_VERSION_1_4;
initArgs.options = mOptions.editArray();
initArgs.nOptions = mOptions.size();