commit ae69111e23fc24491f112a74d2392b117b83e8df
author Narayan Kamath <narayan@google.com> Fri Mar 07 19:40:30 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 07 19:40:30 2014 +0000
tree 2511e7432e3e3dbd390cac4efda94668d7e5fe54
parent 801b3542c72c06cf1d6ea794f516ae966c8a3d9b
parent 96ddea413dcf266d996877d3fc2d81738c5316c8

am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime."

* commit '96ddea413dcf266d996877d3fc2d81738c5316c8':
  Remove java.io.tmpdir assignment in AndroidRuntime.

core/jni/AndroidRuntime.cpp

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 97ea5e6..b4599b6 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -760,13 +760,6 @@
         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();