am a8706527: am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."

* commit 'a870652789cc2b06b921fe66aa1bf48d4fc3e97c':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).
This commit is contained in:
Narayan Kamath
2014-03-11 15:21:04 +00:00
committed by Android Git Automerger

View File

@@ -817,13 +817,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
mOptions.add(opt); 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.version = JNI_VERSION_1_4;
initArgs.options = mOptions.editArray(); initArgs.options = mOptions.editArray();
initArgs.nOptions = mOptions.size(); initArgs.nOptions = mOptions.size();