From 5d92938e5bb830b8ca5a711fd4c1999dd09fd0e3 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Tue, 3 Dec 2013 16:40:04 +0100 Subject: Unify the inclusion of *_extra.gypi files from src/core This makes it possible to use drop-in files for platform specific options needed for example for Boot2Qt. Change-Id: If9db228ac4be414bfea6f4eafe5199ffee495a48 Reviewed-by: Pierre Rossi --- tools/buildscripts/gyp_qtwebengine | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tools/buildscripts') diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index b49341f15..884f57b27 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -54,11 +54,12 @@ def additional_include_files(args=[]): # Always include common.gypi. AddInclude(os.path.join(script_dir, 'common.gypi')) - # Used for additional build tweaks such as file exclusions - AddInclude(os.path.join(qtwebengine_root, 'src', 'core', 'qtwebengine_extras.gypi')) - - # Common stuff we generate and extract from qmake - AddInclude(os.path.join(qtwebengine_root, 'src', 'core', 'qmake_extras.gypi')) + # Include extra gypi files for additional build tweaks such as file exclusions, + # common stuff we generate and extract from qmake and platform specific drop-in files. + build_extras = glob.glob(os.path.join(qtwebengine_root, 'src', 'core', '*_extras.gypi')) + for build in build_extras: + print "Using extra options found in " + build + AddInclude(build) # Optionally add supplemental .gypi files if present. supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi')) -- cgit v1.2.3