diff options
Diffstat (limited to 'WebCore/Android.derived.jscbindings.mk')
| -rw-r--r-- | WebCore/Android.derived.jscbindings.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index 42523a5..fa11703 100644 --- a/WebCore/Android.derived.jscbindings.mk +++ b/WebCore/Android.derived.jscbindings.mk @@ -49,7 +49,11 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\ bindings/scripts/generate-bindings.pl \ ) +<<<<<<< HEAD FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=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 ENABLE_GEOLOCATION=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_DEVICE_ORIENTATION=1 +>>>>>>> webkit.org at r60074 # CSS GEN := \ @@ -104,6 +108,8 @@ GEN := \ $(intermediates)/dom/JSCompositionEvent.h \ $(intermediates)/dom/JSDOMCoreException.h \ $(intermediates)/dom/JSDOMImplementation.h \ + $(intermediates)/dom/JSDOMStringList.h \ + $(intermediates)/dom/JSDeviceOrientationEvent.h \ $(intermediates)/dom/JSDocument.h \ $(intermediates)/dom/JSDocumentFragment.h \ $(intermediates)/dom/JSDocumentType.h \ |