OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0f3fd6c
)
Remove java.io.tmpdir assignment in AndroidRuntime (again).
author
Narayan Kamath
<narayan@google.com>
Tue, 11 Mar 2014 15:02:10 +0000
(15:02 +0000)
committer
Narayan Kamath
<narayan@google.com>
Tue, 11 Mar 2014 15:02:10 +0000
(15:02 +0000)
This was brought back by a bad merge conflict resolution
in change
0efbd9a463c848118c7685f4bfc8765a82caa761
.
Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e
core/jni/AndroidRuntime.cpp
patch
|
blob
|
history
diff --git
a/core/jni/AndroidRuntime.cpp
b/core/jni/AndroidRuntime.cpp
index
98f7716
..
b0835ed
100644
(file)
--- 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();