diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 14:09:24 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:33 +0100 |
commit | 3b523b87218c05c8dd49c191e3d5a7a114907e82 (patch) | |
tree | 9cac2418495c9b21220887e2b785d5eb9bae11b3 /Source/WebCore/Android.derived.v8bindings.mk | |
parent | 9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7 (diff) | |
download | external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.zip external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.tar.gz external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.tar.bz2 |
Merge WebKit at r80534: Fix makefiles.
Add new and remove deleted files to fix makefiles.
See http://trac.webkit.org/changeset/79861 for new
XSLTreeViewer generation.
Also remove a stub from TemporaryLInkStubs that we now get
by compiling the correct files in JSC (see
http://trac.webkit.org/changeset/78634).
Change-Id: I550b035b7c9c915b42738366da7817dca020c9a8
Diffstat (limited to 'Source/WebCore/Android.derived.v8bindings.mk')
-rw-r--r-- | Source/WebCore/Android.derived.v8bindings.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk index 93f8548..1612df9 100644 --- a/Source/WebCore/Android.derived.v8bindings.mk +++ b/Source/WebCore/Android.derived.v8bindings.mk @@ -303,6 +303,7 @@ GEN := \ $(intermediates)/bindings/V8Int16Array.h \ $(intermediates)/bindings/V8Int32Array.h \ $(intermediates)/bindings/V8OESTextureFloat.h \ + $(intermediates)/bindings/V8OESVertexArrayObject.h \ $(intermediates)/bindings/V8Uint8Array.h \ $(intermediates)/bindings/V8Uint16Array.h \ $(intermediates)/bindings/V8Uint32Array.h \ @@ -316,6 +317,7 @@ GEN := \ $(intermediates)/bindings/V8WebGLShader.h \ $(intermediates)/bindings/V8WebGLTexture.h \ $(intermediates)/bindings/V8WebGLUniformLocation.h \ + $(intermediates)/bindings/V8WebGLVertexArrayObjectOES.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 html/canvas --outputdir $(dir $@) $< @@ -434,19 +436,19 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) GEN := \ $(intermediates)/bindings/V8IDBAny.h \ $(intermediates)/bindings/V8IDBCursor.h \ + $(intermediates)/bindings/V8IDBCursorWithValue.h \ $(intermediates)/bindings/V8IDBDatabaseError.h \ $(intermediates)/bindings/V8IDBDatabaseException.h \ $(intermediates)/bindings/V8IDBDatabase.h \ - $(intermediates)/bindings/V8IDBErrorEvent.h \ - $(intermediates)/bindings/V8IDBEvent.h \ $(intermediates)/bindings/V8IDBFactory.h \ $(intermediates)/bindings/V8IDBIndex.h \ $(intermediates)/bindings/V8IDBKey.h \ $(intermediates)/bindings/V8IDBKeyRange.h \ $(intermediates)/bindings/V8IDBObjectStore.h \ $(intermediates)/bindings/V8IDBRequest.h \ - $(intermediates)/bindings/V8IDBSuccessEvent.h \ - $(intermediates)/bindings/V8IDBTransaction.h + $(intermediates)/bindings/V8IDBTransaction.h \ + $(intermediates)/bindings/V8IDBVersionChangeEvent.h \ + $(intermediates)/bindings/V8IDBVersionChangeRequest.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 storage --outputdir $(dir $@) $< |