diff options
author | 2011-07-01 17:16:26 +0000 | |
---|---|---|
committer | 2011-07-01 17:16:26 +0000 | |
commit | 5351b373b3c68e12aecf4f16378bfebc4a5586a2 (patch) | |
tree | e0e5905f744d720d30de4fb51b2876f295e2550d /gyp/opts.gyp | |
parent | 0c8d93a94099dee2dff8da6000ded9ad59676488 (diff) |
combine target_defaults.gypi into common.gypi
http://codereview.appspot.com/4654080
git-svn-id: http://skia.googlecode.com/svn/trunk@1780 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/opts.gyp')
-rw-r--r-- | gyp/opts.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gyp/opts.gyp b/gyp/opts.gyp index a93bf44c3e..42fb8aea4b 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ # Due to an unfortunate intersection of lameness between gcc and gyp, |