diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-06 13:20:18 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 14:57:11 +0100 |
| commit | 808efddb145d485fdb8202437578f218340124b2 (patch) | |
| tree | 102bb6fc821cc0a8d2e52718c77b483292663fe3 /Source/WebCore/Android.derived.v8bindings.mk | |
| parent | bbcce278be9be6a85f47928c38a74c8d36a13a85 (diff) | |
| download | external_webkit-808efddb145d485fdb8202437578f218340124b2.zip external_webkit-808efddb145d485fdb8202437578f218340124b2.tar.gz external_webkit-808efddb145d485fdb8202437578f218340124b2.tar.bz2 | |
Merge WebKit at r84325: Fix makefiles.
See http://trac.webkit.org/changeset/82562 for
new XMLTreeViewer generation.
Change-Id: I52c8d510602e7e77ea6a134510f8e5bb6b0c4d9a
Diffstat (limited to 'Source/WebCore/Android.derived.v8bindings.mk')
| -rw-r--r-- | Source/WebCore/Android.derived.v8bindings.mk | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk index 6d08c1a..4a81f24 100644 --- a/Source/WebCore/Android.derived.v8bindings.mk +++ b/Source/WebCore/Android.derived.v8bindings.mk @@ -149,8 +149,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) # Fileapi GEN := \ $(intermediates)/bindings/V8Blob.h \ -<<<<<<< HEAD - $(intermediates)/bindings/V8BlobBuilder.h \ $(intermediates)/bindings/V8DOMFileSystem.h \ $(intermediates)/bindings/V8DOMFileSystemSync.h \ $(intermediates)/bindings/V8DirectoryEntry.h \ @@ -176,9 +174,10 @@ GEN := \ $(intermediates)/bindings/V8FileSystemCallback.h \ $(intermediates)/bindings/V8FileWriter.h \ $(intermediates)/bindings/V8FileWriterCallback.h \ - $(intermediates)/bindings/V8Flags.h \ $(intermediates)/bindings/V8Metadata.h \ - $(intermediates)/bindings/V8MetadataCallback.h + $(intermediates)/bindings/V8MetadataCallback.h \ + $(intermediates)/bindings/V8WebKitBlobBuilder.h \ + $(intermediates)/bindings/V8WebKitFlags.h $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --include fileapi --outputdir $(dir $@) $< @@ -193,9 +192,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) # HTML GEN := \ $(intermediates)/bindings/V8DOMFormData.h \ -======= - $(intermediates)/bindings/V8DOMTokenList.h \ ->>>>>>> WebKit.org at r84325 $(intermediates)/bindings/V8DOMSettableTokenList.h \ $(intermediates)/bindings/V8DOMTokenList.h \ $(intermediates)/bindings/V8DOMURL.h \ @@ -281,8 +277,8 @@ GEN := \ $(intermediates)/bindings/V8TextMetrics.h \ $(intermediates)/bindings/V8TimeRanges.h \ $(intermediates)/bindings/V8ValidityState.h \ - $(intermediates)/bindings/V8VoidCallback.h \ - $(intermediates)/bindings/V8WebKitBlobBuilder.h + $(intermediates)/bindings/V8VoidCallback.h + $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< |