Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0

1 files changed, 8 insertions, 2 deletions

diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine
index 5003e4b5b..ce2a43328 100755
--- a/tools/buildscripts/gyp_qtwebengine
+++ b/tools/buildscripts/gyp_qtwebengine
@@ -57,13 +57,19 @@ def additional_include_files(args=[]):
   # Always include common.gypi.
   AddInclude(os.path.join(script_dir, 'common.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.
+  # Include extra gypi files for additional build tweaks such as file exclusions
+  # 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)
 
+  # Include extra gypi files for common stuff we generate and extract from qmake.
+  build_extras = glob.glob(os.path.join(output_dir, '*_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'))
   for supplement in supplements: