diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-25 03:26:54 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-25 03:26:54 -0800 |
| commit | 8d4e6f47fe31b9b3990faefd42269e85cab05fc9 (patch) | |
| tree | cd7435878fcd8eecab1213d6e0b05e406967b49d /WebCore/bridge/jni/jni_utility.cpp | |
| parent | 42fa9723e35d0015387952766c19355098122551 (diff) | |
| parent | 073888a8dc1673fa90ca33226485b7bb0e19d460 (diff) | |
| download | external_webkit-8d4e6f47fe31b9b3990faefd42269e85cab05fc9.zip external_webkit-8d4e6f47fe31b9b3990faefd42269e85cab05fc9.tar.gz external_webkit-8d4e6f47fe31b9b3990faefd42269e85cab05fc9.tar.bz2 | |
Merge change I973e6b03 into eclair-mr2
* changes:
Unfork WebCore/bridge/jni.
Diffstat (limited to 'WebCore/bridge/jni/jni_utility.cpp')
| -rw-r--r-- | WebCore/bridge/jni/jni_utility.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/WebCore/bridge/jni/jni_utility.cpp b/WebCore/bridge/jni/jni_utility.cpp index e1eb736..fa63a42 100644 --- a/WebCore/bridge/jni/jni_utility.cpp +++ b/WebCore/bridge/jni/jni_utility.cpp @@ -28,7 +28,7 @@ #if ENABLE(MAC_JAVA_BRIDGE) -#if PLATFORM(ANDROID) +// TODO: ANDROID We need to merge this file with the V8 version. #if USE(JSC) #include "jni_runtime.h" #include "runtime_array.h" @@ -36,7 +36,6 @@ #include <runtime/JSArray.h> #include <runtime/JSLock.h> #endif -#endif #include <dlfcn.h> @@ -352,7 +351,7 @@ jvalue getJNIField( jobject obj, JNIType type, const char *name, const char *sig return result; } -#if PLATFORM(ANDROID) +// TODO: ANDROID we need to merge this file with the V8 version. #if USE(JSC) static jobject convertArrayInstanceToJavaArray(ExecState* exec, JSArray* jsArray, const char* javaClassName) { @@ -584,7 +583,6 @@ jvalue convertValueToJValue(ExecState* exec, JSValue value, JNIType _JNIType, co return result; } #endif // USE(JSC) -#endif // PLATFORM(ANDROID) } // end of namespace Bindings |