diff options
Diffstat (limited to 'Source/WebCore/Android.v8bindings.mk')
| -rw-r--r-- | Source/WebCore/Android.v8bindings.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/WebCore/Android.v8bindings.mk b/Source/WebCore/Android.v8bindings.mk index fe2b126..791d8d4 100644 --- a/Source/WebCore/Android.v8bindings.mk +++ b/Source/WebCore/Android.v8bindings.mk @@ -157,6 +157,7 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8MessageChannelConstructor.cpp \ bindings/v8/custom/V8MessagePortCustom.cpp \ bindings/v8/custom/V8MessageEventCustom.cpp \ + bindings/v8/custom/V8NavigatorCustom.cpp \ bindings/v8/custom/V8NamedNodeMapCustom.cpp \ bindings/v8/custom/V8NamedNodesCollection.cpp \ bindings/v8/custom/V8NavigatorCustom.cpp \ @@ -199,6 +200,7 @@ LOCAL_SRC_FILES += \ bridge/jni/JavaMethodJobject.cpp \ bridge/jni/JobjectWrapper.cpp \ bridge/jni/v8/JNIUtilityPrivate.cpp \ +<<<<<<< HEAD bridge/jni/v8/JavaClassV8.cpp \ bridge/jni/v8/JavaFieldV8.cpp \ bridge/jni/v8/JavaInstanceV8.cpp \ @@ -211,3 +213,10 @@ LOCAL_SRC_FILES += \ # For XSLT. LOCAL_SRC_FILES += \ bindings/v8/custom/V8XSLTProcessorCustom.cpp +======= + bridge/jni/v8/JavaClassJobjectV8.cpp \ + bridge/jni/v8/JavaFieldJobjectV8.cpp \ + bridge/jni/v8/JavaInstanceJobjectV8.cpp \ + bridge/jni/v8/JavaNPObject.cpp \ + bridge/jni/v8/JobjectWrapper.cpp +>>>>>>> WebKit.org at r84325 |