summaryrefslogtreecommitdiffstats
path: root/WebCore/Android.derived.mk
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-06-01 17:47:54 +0100
committerBen Murdoch <benm@google.com>2009-06-15 13:04:46 +0100
commitb679b2a6c810dd2f9e8d7072e542b884a4e7060f (patch)
tree39174505f250d830633ab6ade3ecaab1de56f2e0 /WebCore/Android.derived.mk
parent194315e5a908cc8ed67d597010544803eef1ac59 (diff)
downloadexternal_webkit-b679b2a6c810dd2f9e8d7072e542b884a4e7060f.zip
external_webkit-b679b2a6c810dd2f9e8d7072e542b884a4e7060f.tar.gz
external_webkit-b679b2a6c810dd2f9e8d7072e542b884a4e7060f.tar.bz2
Enable DOM Storage in master with JSC bindings.
Diffstat (limited to 'WebCore/Android.derived.mk')
-rw-r--r--WebCore/Android.derived.mk18
1 files changed, 16 insertions, 2 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk
index 24c271f..6e8b51f 100644
--- a/WebCore/Android.derived.mk
+++ b/WebCore/Android.derived.mk
@@ -62,7 +62,6 @@
# If an entry starts with '/', any subdirectory may match
# If an entry starts with '^', the first directory must match
# LOCAL_DIR_WILDCARD_EXCLUDED := \
-# ^storage/* \
# ^workers/* \
# This comment block is read by tools/webkitsync/diff.cpp
@@ -217,7 +216,7 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\
bindings/scripts/generate-bindings.pl \
)
-FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1
+FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1
GEN := \
$(intermediates)/css/JSCSSCharsetRule.h \
@@ -500,6 +499,21 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
# above rules. Specifying this explicitly makes -j2 work.
$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/storage/%.h
+# new section for DOM Storage APIs
+GEN := \
+ $(intermediates)/storage/JSStorage.h \
+ $(intermediates)/storage/JSStorageEvent.h
+
+$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $<
+$(GEN): $(intermediates)/storage/JS%.h : $(LOCAL_PATH)/storage/%.idl $(js_binding_scripts)
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
+
+# We also need the .cpp files, which are generated as side effects of the
+# above rules. Specifying this explicitly makes -j2 work.
+$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/storage/%.h
+
#new section for svg
ifeq ($(ENABLE_SVG), true)
GEN := \