diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-24 19:41:43 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-24 19:41:43 +0000 |
| commit | 976298edd7a9c7c8a5411381e122feb26a9a69ea (patch) | |
| tree | fcf1687f362c8446010792b44f0fdc4cb4e8b7f5 | |
| parent | 594dd3cd78e2f970d53bb0934fbbb63b41e1d40c (diff) | |
unbreak the build
move define of skia_arch_type to front
git-svn-id: http://skia.googlecode.com/svn/trunk@5650 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/common_variables.gypi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 8e4ab80b9c..b6ddb8d557 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -51,6 +51,8 @@ # so that siblings of the level-2 'variables' dict can see them. 'skia_os%': '<(skia_os)', + 'skia_arch_type%': 'x86', + 'conditions': [ ['skia_os == "win"', { 'os_posix%': 0, @@ -78,7 +80,6 @@ 'skia_mesa%': 0, 'skia_nv_path_rendering%': 0, 'skia_angle%': 0, - 'skia_arch_type%': 'x86', 'skia_directwrite%': 0, 'android_make_apk%': 1, 'skia_nacl%': 0, |