diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 14:00:49 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 14:00:49 -0700 |
| commit | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (patch) | |
| tree | 5298ee7f87a0f97f06d5b2e66c37dedd88238ccf /WebCore/Android.derived.mk | |
| parent | ad9f76210e4cbae75d762b7a65b39af424879b6b (diff) | |
| parent | 36747fa778285f57f2f53c047028be83e9d8776d (diff) | |
| download | external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.zip external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.tar.gz external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.tar.bz2 | |
Merge commit 'goog/master' into webkit_merge
Resolved conflicts:
WebCore/Android.mk
WebCore/storage/LocalStorageArea.h
WebCore/storage/SessionStorageArea.cpp
WebCore/storage/StorageEvent.cpp
Diffstat (limited to 'WebCore/Android.derived.mk')
| -rw-r--r-- | WebCore/Android.derived.mk | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index 9be3a26..0e75e41 100644 --- a/WebCore/Android.derived.mk +++ b/WebCore/Android.derived.mk @@ -60,7 +60,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 @@ -215,7 +214,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 := \ |