From 663a97912921f74c081d2b5184c151742cc00393 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Fri, 8 Mar 2013 22:22:44 +0000 Subject: [PATCH] Fix build Disable r8044 differently. Unreviewed git-svn-id: http://skia.googlecode.com/svn/trunk@8057 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp/common_variables.gypi | 2 +- gyp/tools.gyp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 1934082..8ddbbb4 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -92,7 +92,7 @@ # Note: This is currently only turned on for linux and android. # TODO: Turn on for Win and Mac as well. 'skia_warnings_as_errors%': 0, - 'skia_win_debuggers_path': '', + 'skia_win_debuggers_path%': '', }, # Re-define all variables defined within the level-2 'variables' dict, diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 4e3bc53..63ef258 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -185,7 +185,7 @@ 'tools.gyp:picture_utils', ], 'conditions': [ - ['skia_win_debuggers_path and skia_os == "win"', + ['skia_os == "disable" and skia_win_debuggers_path and skia_os == "win"', { 'dependencies': [ 'tools.gyp:win_dbghelp', @@ -195,7 +195,7 @@ # VS static libraries don't have a linker option. We must set a global # project linker option, or add it to each executable. ['skia_win_debuggers_path and skia_os == "win" and ' - 'skia_arch_width == 64', + 'skia_arch_width == 64 and skia_os == "disable"', { 'msvs_settings': { 'VCLinkerTool': { @@ -207,7 +207,7 @@ }, ], ['skia_win_debuggers_path and skia_os == "win" and ' - 'skia_arch_width == 32', + 'skia_arch_width == 32 and skia_os == "disable"', { 'msvs_settings': { 'VCLinkerTool': { @@ -270,7 +270,7 @@ }, ], 'conditions': [ - ['skia_win_debuggers_path and skia_os == "win"', + ['skia_os == "disable" and skia_win_debuggers_path and skia_os == "win"', { 'targets': [ { -- 2.7.4