Chromium Code Reviews| Index: gyp/common_variables.gypi |
| diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi |
| index 6145d47e0137e45ff3bdc247e807b7231c2f2549..5e7eacf07f605d4b77dfb1fac30bfc409ba794ab 100644 |
| --- a/gyp/common_variables.gypi |
| +++ b/gyp/common_variables.gypi |
| @@ -72,10 +72,16 @@ |
| }, { |
| 'skia_poppler_enabled%': 0, |
| }], |
| - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', { |
|
djsollen
2014/03/28 14:31:25
just add 'or skia_arch_type == "arm64"' to this co
|
| + [ 'skia_arch_type == "arm64"', { |
| 'skia_arch_width%': 64, |
| }, { |
| - 'skia_arch_width%': 32, |
| + 'conditions': [ |
| + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', { |
| + 'skia_arch_width%': 64, |
| + }, { |
| + 'skia_arch_width%': 32, |
| + }], |
| + ], |
| }], |
| [ 'skia_os == "android"', { |
| 'skia_static_initializers%': 0, |