diff options
author | Nicolas Roard <nicolas@android.com> | 2010-01-04 15:40:02 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-04 15:40:02 -0800 |
commit | 8c8c7b43f311d492d2c13ee68bc91875262ae072 (patch) | |
tree | 562cf7eb725dd0af65509962b785a5f5cf605156 /WebCore | |
parent | 48ee006aa07478ee755884436f162a956524b4f7 (diff) | |
parent | 3703e41d68a5747ef178cd5fc4361ee7c9e38249 (diff) | |
download | external_webkit-8c8c7b43f311d492d2c13ee68bc91875262ae072.zip external_webkit-8c8c7b43f311d492d2c13ee68bc91875262ae072.tar.gz external_webkit-8c8c7b43f311d492d2c13ee68bc91875262ae072.tar.bz2 |
am 3703e41d: am 3bacb88b: Revert to ENABLE_ORIENTATION_EVENTS=1
Merge commit '3703e41d68a5747ef178cd5fc4361ee7c9e38249'
* commit '3703e41d68a5747ef178cd5fc4361ee7c9e38249':
Revert to ENABLE_ORIENTATION_EVENTS=1
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index ada160b..a9f403a 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -31,7 +31,7 @@ js_binding_scripts := \ $(LOCAL_PATH)/bindings/scripts/generate-bindings.pl # Add ACCELERATED_COMPOSITING=1 and ENABLE_3D_RENDERING=1 for layers support -FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 V8_BINDING ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_WORKERS=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 +FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 V8_BINDING ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_WORKERS=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 # CSS GEN := \ |