summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/Android.derived.v8bindings.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/Android.derived.v8bindings.mk')
-rw-r--r--Source/WebCore/Android.derived.v8bindings.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk
index 0bee200..12aca59 100644
--- a/Source/WebCore/Android.derived.v8bindings.mk
+++ b/Source/WebCore/Android.derived.v8bindings.mk
@@ -93,6 +93,7 @@ GEN := \
$(intermediates)/bindings/V8DOMImplementation.h \
$(intermediates)/bindings/V8DOMStringList.h \
$(intermediates)/bindings/V8DOMStringMap.h \
+ $(intermediates)/bindings/V8DataTransferItems.h \
$(intermediates)/bindings/V8DeviceMotionEvent.h \
$(intermediates)/bindings/V8DeviceOrientationEvent.h \
$(intermediates)/bindings/V8Document.h \
@@ -361,12 +362,9 @@ GEN := \
$(intermediates)/bindings/V8Navigator.h \
$(intermediates)/bindings/V8PositionError.h \
$(intermediates)/bindings/V8Screen.h \
-<<<<<<< HEAD
$(intermediates)/bindings/V8SpeechInputEvent.h \
-=======
$(intermediates)/bindings/V8WebKitAnimation.h \
$(intermediates)/bindings/V8WebKitAnimationList.h \
->>>>>>> webkit.org at r82507
$(intermediates)/bindings/V8WebKitPoint.h \
$(intermediates)/bindings/V8WorkerNavigator.h
$(GEN): PRIVATE_PATH := $(LOCAL_PATH)