Bug 1296798 - set depth to chrome_src for refs in common.gypi draft
authorMyk Melez <myk@mykzilla.org>
Fri, 19 Aug 2016 16:56:02 -0700
changeset 403577 bd8d0dbd8727c713823dc894c10b73283bc21391
parent 403575 d5858079dbe1a00b4ed9572fef134dc38d93e659
child 528940 410a1b2490eeb3376196a4054368e73224f4c1af
push id26948
push userbmo:myk@mykzilla.org
push dateSat, 20 Aug 2016 00:18:53 +0000
bugs1296798
milestone51.0a1
Bug 1296798 - set depth to chrome_src for refs in common.gypi MozReview-Commit-ID: EJTQNk6dbJ1
python/mozbuild/mozbuild/frontend/gyp_reader.py
--- a/python/mozbuild/mozbuild/frontend/gyp_reader.py
+++ b/python/mozbuild/mozbuild/frontend/gyp_reader.py
@@ -102,17 +102,17 @@ def read_from_gyp(config, path, output, 
     includes.extend(encode(mozpath.join(chrome_src, name))
         for name, _ in finder.find('*/supplement.gypi'))
 
     # Read the given gyp file and its dependencies.
     generator, flat_list, targets, data = \
         gyp.Load([path], format=b'mozbuild',
             default_variables=str_vars,
             includes=includes,
-            depth=encode(mozpath.dirname(path)),
+            depth=encode(chrome_src),
             params=params)
 
     # Process all targets from the given gyp files and its dependencies.
     # The path given to AllTargets needs to use os.sep, while the frontend code
     # gives us paths normalized with forward slash separator.
     for target in gyp.common.AllTargets(flat_list, targets, path.replace(b'/', os.sep)):
         build_file, target_name, toolset = gyp.common.ParseQualifiedTarget(target)