From 21415977868b59b883370ceaba6dcbc7e4fe08c7 Mon Sep 17 00:00:00 2001 From: "yaar@chromium.org" Date: Thu, 1 Oct 2009 23:08:42 +0000 Subject: Override mechanism for features.gypi This will allow us to have a different set of feature_defines for upstream and downstream webkit builds. Review URL: http://codereview.chromium.org/242102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27789 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 8 ++++++-- build/features_override.gypi | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 build/features_override.gypi diff --git a/DEPS b/DEPS index 91c1735..88fa375 100644 --- a/DEPS +++ b/DEPS @@ -187,11 +187,15 @@ hooks = [ { # A change to a .gyp, .gypi, or to GYP itself should run the generator. "pattern": ".", - "action": ["python", "src/build/gyp_chromium"], + "action": ["python", + "src/build/gyp_chromium", + "-Isrc/build/features_override.gypi"], }, { # Workaround IncrediBuild problem. http://crbug.com/17706. "pattern": "\\.grd$", - "action": ["python", "src/build/win/clobber_generated_headers.py", "$matching_files"], + "action": ["python", + "src/build/win/clobber_generated_headers.py", + "$matching_files"], }, ] diff --git a/build/features_override.gypi b/build/features_override.gypi new file mode 100644 index 0000000..2023705 --- /dev/null +++ b/build/features_override.gypi @@ -0,0 +1,41 @@ +# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# This file is only included in full-chromium builds, and overrides the +# feature_defines variable in third_party/WebKit/WebKit/chromium/features.gypi. +{ + 'variables': { + # WARNING: This list of strings completely replaces the list in + # features.gypi. Therefore, if an enable is listed in features.gypi + # but not listed below, it will revert to its hardcoded webkit value. + 'feature_defines': [ + 'ENABLE_3D_CANVAS=0', + 'ENABLE_CHANNEL_MESSAGING=1', + 'ENABLE_DATABASE=1', + 'ENABLE_DATAGRID=0', + 'ENABLE_OFFLINE_WEB_APPLICATIONS=1', + 'ENABLE_DASHBOARD_SUPPORT=0', + 'ENABLE_DOM_STORAGE=1', + 'ENABLE_JAVASCRIPT_DEBUGGER=0', + 'ENABLE_JSC_MULTIPLE_THREADS=0', + 'ENABLE_ICONDATABASE=0', + 'ENABLE_NOTIFICATIONS=0', + 'ENABLE_ORIENTATION_EVENTS=0', + 'ENABLE_XSLT=1', + 'ENABLE_XPATH=1', + 'ENABLE_SHARED_WORKERS=0', + 'ENABLE_SVG=1', + 'ENABLE_SVG_ANIMATION=1', + 'ENABLE_SVG_AS_IMAGE=1', + 'ENABLE_SVG_USE=1', + 'ENABLE_SVG_FOREIGN_OBJECT=1', + 'ENABLE_SVG_FONTS=1', + 'ENABLE_VIDEO=1', + 'ENABLE_WORKERS=1', + ], + # TODO: If the need arises, create a mechanism that will intelligently + # merge the lists rather than replace one with the other. This may + # require changes in gyp. + }, +} \ No newline at end of file -- cgit v1.1