diff options
| author | Ben Murdoch <benm@google.com> | 2009-07-01 20:02:08 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-07-06 11:26:30 +0100 |
| commit | 0f474a448c71c0204d9d41f067d725b6e90703ef (patch) | |
| tree | 0c0dfde0f7c1c6bcded9fb2d56e8e6bd28fe2549 /WebCore/Android.derived.mk | |
| parent | 3f84acc12c5a694d9c4073aa1de33fbdf1cd22d1 (diff) | |
| download | external_webkit-0f474a448c71c0204d9d41f067d725b6e90703ef.zip external_webkit-0f474a448c71c0204d9d41f067d725b6e90703ef.tar.gz external_webkit-0f474a448c71c0204d9d41f067d725b6e90703ef.tar.bz2 | |
Enable workers w/JSC.
Diffstat (limited to 'WebCore/Android.derived.mk')
| -rw-r--r-- | WebCore/Android.derived.mk | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index a28bbd2..c8a2651 100644 --- a/WebCore/Android.derived.mk +++ b/WebCore/Android.derived.mk @@ -23,11 +23,9 @@ # css/RGBColor.idl \ # dom/EventListener.idl \ # dom/EventTarget.idl \ -# dom/Worker*.idl \ # html/CanvasPixelArray.idl \ # page/AbstractView.idl \ # page/PositionCallback.idl \ -# page/Worker*.idl \ # svg/ElementTimeControl.idl \ # svg/SVGAnimatedPathData.idl \ # svg/SVGAnimatedPoints.idl \ @@ -48,7 +46,6 @@ # # The following files are intentionally not generated # LOCAL_GENERATED_FILES_EXCLUDED := \ -# JSWorkerContextBase.lut.h \ # WMLElementFactory.cpp \ # WMLNames.cpp \ # XLinkNames.cpp \ @@ -59,8 +56,8 @@ # The following directory wildcard matches are intentionally not included # If an entry starts with '/', any subdirectory may match # If an entry starts with '^', the first directory must match -# LOCAL_DIR_WILDCARD_EXCLUDED := \ -# ^workers/* \ +# LOCAL_DIR_WILDCARD_EXCLUDED := +# # This comment block is read by tools/webkitsync/diff.cpp # Don't remove it or move it. @@ -214,7 +211,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 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 +FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 GEN := \ $(intermediates)/css/JSCSSCharsetRule.h \ @@ -454,7 +451,9 @@ GEN := \ $(intermediates)/page/JSPositionError.h \ $(intermediates)/page/JSPositionErrorCallback.h \ $(intermediates)/page/JSScreen.h \ - $(intermediates)/page/JSWebKitPoint.h + $(intermediates)/page/JSWebKitPoint.h \ + $(intermediates)/page/JSWorkerNavigator.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)/page/JS%.h : $(LOCAL_PATH)/page/%.idl $(js_binding_scripts) @@ -661,6 +660,22 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/svg/%.cpp : $(intermediates)/svg/%.h endif +# new section for Workers +GEN := \ + $(intermediates)/workers/JSWorker.h \ + $(intermediates)/workers/JSWorkerContext.h \ + $(intermediates)/workers/JSWorkerLocation.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)/workers/JS%.h : $(LOCAL_PATH)/workers/%.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)/workers/%.cpp : $(intermediates)/workers/%.h + #new section for xml/DOMParser.idl GEN := \ $(intermediates)/xml/JSDOMParser.h \ |