diff options
| author |  bsalomon <bsalomon@google.com> | 2016-04-13 08:02:42 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-13 08:02:43 -0700 |
| commit | 09e127bd38d4f972134afca77184b217a9708b3a (patch) | |
| tree | 57697b748fb3fad6a316603aa9ad3c84461748ce /gyp | |
| parent | 0b7e5a13bd371126b5d5794f3f9d2930c35ce05f (diff) | |
Make build_shaderc.py blow away output dir and allow build_type arg to contain either Debug or Release
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1884963002
Review URL: https://codereview.chromium.org/1884963002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/shaderc.gyp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gyp/shaderc.gyp b/gyp/shaderc.gyp index 26af80a4d1..7732e221ac 100644 --- a/gyp/shaderc.gyp +++ b/gyp/shaderc.gyp @@ -8,12 +8,8 @@ 'variables': { 'variables': { # This is the dreaded nested variables dict so that we can # have dependent variables + 'shaderc_build_configuration': '<(CONFIGURATION_NAME)', 'conditions': [ - [ 'CONFIGURATION_NAME == "Release_Developer"', { - 'shaderc_build_configuration' : 'Release', - }, { - 'shaderc_build_configuration' : '<(CONFIGURATION_NAME)', - }], [ 'skia_os == "win"', { 'shaderc_lib_name' : 'shaderc_combined.lib', }, { |