aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp_skia
diff options
context:
space:
mode:
authorGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-16 13:52:49 +0000
committerGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-16 13:52:49 +0000
commitaa3b6a965e462eccf3d9b5c750816e6c534433fb (patch)
treebc7eb8ead428f3ff6926c99797c773256c705ba7 /gyp_skia
parentfb2d3c69816253ab7d2df576718c252ae1158c65 (diff)
Make all gyp targets automatically include common.gypi
Do this, rather than including common.gypi explicitly in all our gyp files, so that gyp files we use but do not maintain (e.g., third_party/externals/libjpeg/libjpeg.gyp) will include common.gypi too. Review URL: https://codereview.appspot.com/5820068 git-svn-id: http://skia.googlecode.com/svn/trunk@3411 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp_skia')
-rwxr-xr-xgyp_skia6
1 files changed, 6 insertions, 0 deletions
diff --git a/gyp_skia b/gyp_skia
index 75a3a21d98..cf55084cae 100755
--- a/gyp_skia
+++ b/gyp_skia
@@ -44,6 +44,12 @@ def additional_include_files(args=[]):
if os.path.realpath(path) not in specified_includes:
result.append(path)
+ # Always include common.gypi.
+ # We do this, rather than including common.gypi explicitly in all our gyp
+ # files, so that gyp files we use but do not maintain (e.g.,
+ # third_party/externals/libjpeg/libjpeg.gyp) will include common.gypi too.
+ AddInclude(os.path.join(gyp_config_dir, 'common.gypi'))
+
return result
if __name__ == '__main__':