diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/Android.v8bindings.mk | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
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 |