diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-09 21:53:00 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-09 21:53:00 +0100 |
| commit | ccda9a8f27748b5bfc2ef25a90e08fade8449d14 (patch) | |
| tree | f276ca253fdad9f5a07708856a3806e701a2f2e8 /Source/WebCore/bridge | |
| parent | 9da2ed34003cdea1a8c35c2f0947bb6632d99240 (diff) | |
| download | external_webkit-ccda9a8f27748b5bfc2ef25a90e08fade8449d14.zip external_webkit-ccda9a8f27748b5bfc2ef25a90e08fade8449d14.tar.gz external_webkit-ccda9a8f27748b5bfc2ef25a90e08fade8449d14.tar.bz2 | |
Fix build break for emulator
JavaTypeString is only available for V8.
Change-Id: I53a1d36b61268496486264cbc6c96fe1e0a5fbd3
Diffstat (limited to 'Source/WebCore/bridge')
| -rw-r--r-- | Source/WebCore/bridge/jni/JavaMethodJobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/bridge/jni/JavaMethodJobject.cpp b/Source/WebCore/bridge/jni/JavaMethodJobject.cpp index 5df16f9..5bb873d 100644 --- a/Source/WebCore/bridge/jni/JavaMethodJobject.cpp +++ b/Source/WebCore/bridge/jni/JavaMethodJobject.cpp @@ -130,7 +130,7 @@ const char* JavaMethodJobject::signature() const appendClassName(signatureBuilder, javaClassName.data()); else { signatureBuilder.append(signatureFromJavaType(type)); -#if PLATFORM(ANDROID) +#if PLATFORM(ANDROID) && USE(V8) // FIXME: Upstream to WebKit // https://bugs.webkit.org/show_bug.cgi?id=62389 if (type == JavaTypeObject || type == JavaTypeString) { @@ -149,7 +149,7 @@ const char* JavaMethodJobject::signature() const appendClassName(signatureBuilder, returnType); else { signatureBuilder.append(signatureFromJavaType(m_returnType)); -#if PLATFORM(ANDROID) +#if PLATFORM(ANDROID) && USE(V8) // FIXME: Upstream to WebKit // https://bugs.webkit.org/show_bug.cgi?id=62389 if (m_returnType == JavaTypeObject || m_returnType == JavaTypeString) { |