diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-28 16:19:03 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-28 16:19:03 +0000 |
| commit | 7f562ad0add2b8861dbaa2cd705155272bdf7c81 (patch) | |
| tree | 18ff1395679f1e4b552052a026f5cbd4cc3e15b7 | |
| parent | 3ab3175030ef1c36c12fe53f1c3c68c4a3438b8c (diff) | |
fix the build
git-svn-id: http://skia.googlecode.com/svn/trunk@4387 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/common.gypi | 2 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index 85c590d56a..06db4a8823 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -24,7 +24,7 @@ ['skia_angle and not skia_os == "win"', {'error': '<!(skia_angle=1 only supported with skia_os="win".)' }], - ['skia_arch_width != 32 or skia_arch_width != 64', + ['skia_arch_width != 32 and skia_arch_width != 64', {'error': '<!(skia_arch_width can only be 32 or 64 bits not <(skia_arch_width) bits)' }], ], diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 49aadddc04..69cd50962b 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -64,7 +64,7 @@ # Do not turn on 'skia_angle' - it is currently experimental 'skia_angle%': 0, 'skia_arch_type%': 'x86', - 'skia_arch_width%': '32', + 'skia_arch_width%': 32, }, # Re-define all variables defined within the level-2 'variables' dict, |