diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-27 20:40:31 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-27 20:40:31 +0000 |
| commit | 9d0ecf48c411d45e86378c1c30feffcb513e5df7 (patch) | |
| tree | d2007291db48c2ebcd967ab8ab8e8220cda3fddb | |
| parent | 3107b6a85eee7914b37382f7145ab658e8c27667 (diff) | |
Modify how gpu.gyp includes angle.gyp.
Instead of including dependencies on angle.gyp and then removing
them if skia_angle is not true, only include angle.gyp to begin
with skia_angle is true.
This allows gyp_to_android.py to work when run in the Android tree,
where we don't have third_party/externals (since we do only a git
merge, and no gclient sync.
R=djsollen@google.com, robertphillips@google.com, bsalomon@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/178223015
git-svn-id: http://skia.googlecode.com/svn/trunk@13618 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/gpu.gyp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index 77cbf2e256..471004cbe4 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -1,3 +1,4 @@ +# GYP for building gpu { 'target_defaults': { 'conditions': [ @@ -81,7 +82,6 @@ 'type': 'static_library', 'standalone_static_library': 1, 'dependencies': [ - 'angle.gyp:*', 'core.gyp:*', 'edtaa.gyp:*', 'utils.gyp:*', @@ -94,9 +94,6 @@ '../src/core', '../src/gpu', ], - 'export_dependent_settings': [ - 'angle.gyp:*', - ], 'sources': [ '<@(skgpu_sources)', '<@(skgpu_native_gl_sources)', @@ -208,16 +205,17 @@ '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', ], }], - [ 'not skia_angle', { - 'sources!': [ - '<@(skgpu_angle_gl_sources)', - ], - 'dependencies!': [ + [ 'skia_angle', { + 'dependencies': [ 'angle.gyp:*', ], - 'export_dependent_settings!': [ + 'export_dependent_settings': [ 'angle.gyp:*', ], + }, { # not skia_angle + 'sources!': [ + '<@(skgpu_angle_gl_sources)', + ], }], [ 'skia_os == "android"', { 'sources!': [ |