diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-09 13:34:26 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-09 13:34:26 +0000 |
| commit | 479d1ae9b693fb6cf739371c32916523da7b09df (patch) | |
| tree | 113bf5ddbad7f983e6a8e8f8416ede4b82f26455 /gyp | |
| parent | 95c2e5532b094add82b007bdfcd4c64050b6b366 (diff) | |
Fixes to Android.mk generation for arm64.
Remove warning about no optimizations for arm64 and rebaseline the
associated test.
Exclude _opts_none.cpps when building arm64, to avoid double definitions.
BUG=skia:1975
R=halcanary@google.com, djsollen@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/229393002
git-svn-id: http://skia.googlecode.com/svn/trunk@14104 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/opts.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gyp/opts.gyp b/gyp/opts.gyp index 783ea4eb7a..745259f750 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -103,7 +103,7 @@ }], [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) \ or (skia_os == "ios") \ - or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips"])', { + or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', { 'sources': [ '../src/opts/SkBitmapProcState_opts_none.cpp', '../src/opts/SkBlitMask_opts_none.cpp', |