diff options
| author |  egdaniel <egdaniel@google.com> | 2015-03-09 09:40:42 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-09 09:40:42 -0700 |
| commit | 86e31a19800bd15dafa317bd0ab54a27dc39a6b5 (patch) | |
| tree | a94df2095ae007977e3168a2bd5621c09528ab8f /gyp | |
| parent | 33a4582a2537a986de9135227990842ac9289586 (diff) | |
Allow user to pass in a path for extra dependencies for gpu
BUG=skia:
Review URL: https://codereview.chromium.org/986363002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_variables.gypi | 2 | ||||
| -rw-r--r-- | gyp/gpu.gyp | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 3310aac84a..bbd09a6eee 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -138,6 +138,7 @@ 'skia_sanitizer%': '', 'skia_scalar%': 'float', 'skia_mesa%': 0, + 'skia_gpu_extra_dependency_path%': '', 'skia_stroke_path_rendering%': 0, 'skia_android_path_rendering%': 0, 'skia_resource_cache_mb_limit%': 0, @@ -215,6 +216,7 @@ 'skia_sanitizer%': '<(skia_sanitizer)', 'skia_scalar%': '<(skia_scalar)', 'skia_mesa%': '<(skia_mesa)', + 'skia_gpu_extra_dependency_path%': '<(skia_gpu_extra_dependency_path)', 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', 'skia_android_framework%': '<(skia_android_framework)', 'skia_use_system_json%': '<(skia_use_system_json)', diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index e835e34850..c69a4867d6 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -108,6 +108,11 @@ 'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], 'conditions': [ + [ 'skia_gpu_extra_dependency_path', { + 'dependencies' : [ + '<(skia_gpu_extra_dependency_path):*', + ] + }], [ 'skia_stroke_path_rendering', { 'sources': [ '../experimental/StrokePathRenderer/GrStrokePathRenderer.h', |