diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-13 12:53:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-13 12:53:31 -0700 |
| commit | 83918a64fbe1b19b3e7cf86a7d16ec1eb74024e2 (patch) | |
| tree | 545f974341b69865b11dcd80b085f1a671a5b6dc | |
| parent | 8fe05189c51b0ae29ba6f8c9d4c86fa288110707 (diff) | |
| parent | 301fbd5cdb131522d03003ff0b8a2db26e5a5ee6 (diff) | |
| download | external_webkit-83918a64fbe1b19b3e7cf86a7d16ec1eb74024e2.zip external_webkit-83918a64fbe1b19b3e7cf86a7d16ec1eb74024e2.tar.gz external_webkit-83918a64fbe1b19b3e7cf86a7d16ec1eb74024e2.tar.bz2 | |
Merge change 1562
* changes:
Remove uncommented makefile conditional. Fix an assert condition.
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | WebKit/android/jni/WebCoreJni.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -266,9 +266,7 @@ include $(BASE_PATH)/WebKit/android/plugins/sample/Android.mk include $(BASE_PATH)/WebKit/android/wds/client/Android.mk # Build the performance command line tool but only if v8 is disabled. -#ifneq ($(ENABLE_V8),true) include $(BASE_PATH)/perf/Android.mk -#endif # Build the webkit merge tool. include $(BASE_PATH)/WebKitTools/android/webkitmerge/Android.mk diff --git a/WebKit/android/jni/WebCoreJni.cpp b/WebKit/android/jni/WebCoreJni.cpp index 139058e..b757e3a 100644 --- a/WebKit/android/jni/WebCoreJni.cpp +++ b/WebKit/android/jni/WebCoreJni.cpp @@ -87,7 +87,7 @@ WebCore::String to_string(JNIEnv* env, jstring str) int register_webcorejni(JNIEnv* env) { // Instantiate the WeakReference fields. jclass weakRef = env->FindClass("java/lang/ref/WeakReference"); - LOG_ASSERT(android::weakRef, "Could not find WeakReference"); + LOG_ASSERT(weakRef, "Could not find WeakReference"); android::gWeakRefClass = (jclass)env->NewGlobalRef(weakRef); android::gWeakRefInit = env->GetMethodID(android::gWeakRefClass, "<init>", "(Ljava/lang/Object;)V"); |