summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Clarke <leonclarke@google.com>2010-06-04 17:20:59 +0100
committerLeon Clarke <leonclarke@google.com>2010-06-08 14:50:09 +0100
commitb0e900ed67f9655e2cffe4a5a6839826e5c67421 (patch)
treea5aec7a02a77f62b6b1da9642ad8e04786c81bb1
parent42ce4030a1ff35b1154f5c07e06c84875ec75adc (diff)
downloadexternal_webkit-b0e900ed67f9655e2cffe4a5a6839826e5c67421.zip
external_webkit-b0e900ed67f9655e2cffe4a5a6839826e5c67421.tar.gz
external_webkit-b0e900ed67f9655e2cffe4a5a6839826e5c67421.tar.bz2
Merge webkit.org at r60469 : Cherry pick of makefile fix from webkit change 60777
http://trac.webkit.org/changeset/60777 Change-Id: If7a0c263b6ea24898e219f4b59416add2c52dcca
-rw-r--r--WebCore/Android.derived.v8bindings.mk24
1 files changed, 12 insertions, 12 deletions
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index 77e1c48..7519ff0 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -375,21 +375,21 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
# Indexed Database
GEN := \
- $(intermediates)/storage/V8IDBAny.h \
- $(intermediates)/storage/V8IDBDatabaseError.h \
- $(intermediates)/storage/V8IDBDatabaseException.h \
- $(intermediates)/storage/V8IDBDatabaseRequest.h \
- $(intermediates)/storage/V8IDBErrorEvent.h \
- $(intermediates)/storage/V8IDBEvent.h \
- $(intermediates)/storage/V8IDBIndexRequest.h \
- $(intermediates)/storage/V8IDBRequest.h \
- $(intermediates)/storage/V8IDBSuccessEvent.h \
- $(intermediates)/storage/V8IndexedDatabaseRequest.h
+ $(intermediates)/bindings/V8IDBAny.h \
+ $(intermediates)/bindings/V8IDBDatabaseError.h \
+ $(intermediates)/bindings/V8IDBDatabaseException.h \
+ $(intermediates)/bindings/V8IDBDatabaseRequest.h \
+ $(intermediates)/bindings/V8IDBErrorEvent.h \
+ $(intermediates)/bindings/V8IDBEvent.h \
+ $(intermediates)/bindings/V8IDBIndexRequest.h \
+ $(intermediates)/bindings/V8IDBRequest.h \
+ $(intermediates)/bindings/V8IDBSuccessEvent.h \
+ $(intermediates)/bindings/V8IndexedDatabaseRequest.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 $@) $<
+$(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 $@) $<
$(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/storage/%.idl $(js_binding_scripts)
- $(transform-generated-source)
+ $(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
# We also need the .cpp files, which are generated as side effects of the