diff options
Diffstat (limited to 'Source/WebCore/Android.v8bindings.mk')
| -rw-r--r-- | Source/WebCore/Android.v8bindings.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/WebCore/Android.v8bindings.mk b/Source/WebCore/Android.v8bindings.mk index 710d381..446051a 100644 --- a/Source/WebCore/Android.v8bindings.mk +++ b/Source/WebCore/Android.v8bindings.mk @@ -192,12 +192,14 @@ LOCAL_SRC_FILES += \ bindings/v8/specialization/V8BindingState.cpp LOCAL_SRC_FILES += \ - bridge/jni/JNIBridge.cpp \ bridge/jni/JNIUtility.cpp \ - bridge/jni/v8/JNIBridgeV8.cpp \ + bridge/jni/JavaMethod.cpp \ + bridge/jni/JobjectWrapper.cpp \ bridge/jni/v8/JNIUtilityPrivate.cpp \ bridge/jni/v8/JavaClassV8.cpp \ + bridge/jni/v8/JavaFieldV8.cpp \ bridge/jni/v8/JavaInstanceV8.cpp \ +<<<<<<< HEAD bridge/jni/v8/JavaNPObjectV8.cpp # For XPath. @@ -207,3 +209,7 @@ LOCAL_SRC_FILES += \ # For XSLT. LOCAL_SRC_FILES += \ bindings/v8/custom/V8XSLTProcessorCustom.cpp +======= + bridge/jni/v8/JavaNPObject.cpp \ + bridge/jni/v8/JobjectWrapper.cpp +>>>>>>> WebKit at r80534 |