diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-07-13 11:06:57 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-07-13 19:45:44 -0400 |
| commit | c1b9bbb21c8ad5109978a4e9e770cd18b0257434 (patch) | |
| tree | bfb7dd2272e5fe29d3c0fc4f22ca708e00bc10be /core/jni/AndroidRuntime.cpp | |
| parent | b6e5e7a740bf595a1a5d32b28549e5d579a04ee3 (diff) | |
| download | frameworks_base-c1b9bbb21c8ad5109978a4e9e770cd18b0257434.zip frameworks_base-c1b9bbb21c8ad5109978a4e9e770cd18b0257434.tar.gz frameworks_base-c1b9bbb21c8ad5109978a4e9e770cd18b0257434.tar.bz2 | |
Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index a61217a..23c6da7 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -623,16 +623,9 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) } /* enable debugging; set suspend=y to pause during VM init */ -#ifdef HAVE_ANDROID_OS /* use android ADB transport */ opt.optionString = "-agentlib:jdwp=transport=dt_android_adb,suspend=n,server=y"; -#else - /* use TCP socket; address=0 means start at port 8000 and probe up */ - LOGI("Using TCP socket for JDWP\n"); - opt.optionString = - "-agentlib:jdwp=transport=dt_socket,suspend=n,server=y,address=0"; -#endif mOptions.add(opt); char enableDPBuf[sizeof("-Xdeadlockpredict:") + PROPERTY_VALUE_MAX]; |