commit dfc1ef92557be5565469a2fc8b075f46dc3b4948
author Narayan Kamath <narayan@google.com> Wed Feb 19 16:37:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 19 16:37:03 2014 +0000
tree 4cfb62711111f427a19f65893b00c3960890e4a2
parent ed0cd0c38d234a61b7c20ef434ff0449edf98304
parent 29596ac2baef37de4cfed494cd740de8d1090899

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

* commit '29596ac2baef37de4cfed494cd740de8d1090899':
  Remove java.io.tmpdir assignment in AndroidRuntime.

core/jni/AndroidRuntime.cpp

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 77c5c18..100f71d 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -761,13 +761,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();