Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add support for selecting alternate JDWP implementations"

Browse Source
This commit is contained in:
Alex Light
2017-12-20 15:04:10 +00:00
committed by Gerrit Code Review
parent 6991266aa6 fffb273aff
commit cbeea23861
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/jni/AndroidRuntime.cpp
View File

@@ -643,6 +643,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote)
char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX]; char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX];
char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX]; char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];
std::string fingerprintBuf; std::string fingerprintBuf;
char jdwpProviderBuf[sizeof("-XjdwpProvider:") - 1 + PROPERTY_VALUE_MAX];
bool checkJni = false; bool checkJni = false;
property_get("dalvik.vm.checkjni", propBuf, ""); property_get("dalvik.vm.checkjni", propBuf, "");
@@ -765,9 +766,15 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote)
* Set suspend=y to pause during VM init and use android ADB transport. * Set suspend=y to pause during VM init and use android ADB transport.
*/ */
if (zygote) { if (zygote) {
addOption("-agentlib:jdwp=transport=dt_android_adb,suspend=n,server=y"); addOption("-XjdwpOptions:suspend=n,server=y");
} }
// Set the JDWP provider. By default let the runtime choose.
parseRuntimeOption("dalvik.vm.jdwp-provider",
jdwpProviderBuf,
"-XjdwpProvider:",
"default");
parseRuntimeOption("dalvik.vm.lockprof.threshold", parseRuntimeOption("dalvik.vm.lockprof.threshold",
lockProfThresholdBuf, lockProfThresholdBuf,
"-Xlockprofthreshold:"); "-Xlockprofthreshold:");