diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-28 16:08:05 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-28 16:08:05 +0000 |
| commit | e341cb37e64ff9fc95c139a746bf5955ae219efb (patch) | |
| tree | e90056ff37cb4b8c93db26118b3f4a450d7bd7da /gyp/core.gyp | |
| parent | 565254bc9343d0befdfbbb97a3dc6d44c6e18658 (diff) | |
Separate target architecture type and width into separate variables.
Also add support for building mac in 64 bit mode.
Review URL: https://codereview.appspot.com/6343050
git-svn-id: http://skia.googlecode.com/svn/trunk@4385 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/core.gyp')
| -rw-r--r-- | gyp/core.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gyp/core.gyp b/gyp/core.gyp index 5386407eca..a109d7b23f 100644 --- a/gyp/core.gyp +++ b/gyp/core.gyp @@ -313,7 +313,7 @@ 'android_system.gyp:ft2', ], }], - [ 'skia_os == "android" and skia_target_arch == "arm" and armv7 == 1', { + [ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', { # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. 'sources': [ '../src/core/SkUtilsArm.cpp', |