summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-03-13 01:55:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 01:55:28 +0000
commitacccf836166353110aa80f65fdd2fef27c237aa6 (patch)
tree2d9caa5f98bbfa2b1c48b4f6e3cf66ef0117f176 /core/jni
parent6934a165170c1da527cb2be6697974d2fbde5ad3 (diff)
parentb071a07da89a8736fa4fd757f9a6c6e990d0e858 (diff)
downloadframeworks_base-acccf836166353110aa80f65fdd2fef27c237aa6.zip
frameworks_base-acccf836166353110aa80f65fdd2fef27c237aa6.tar.gz
frameworks_base-acccf836166353110aa80f65fdd2fef27c237aa6.tar.bz2
am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit 'b071a07da89a8736fa4fd757f9a6c6e990d0e858': Remove java.io.tmpdir assignment in AndroidRuntime (again).
Diffstat (limited to 'core/jni')
-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 98f7716..b0835ed 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -817,13 +817,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();