commit f7542ba18ef9393b1bb312e41f7ad4c37654b1b8
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 31 12:57:27 2013 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 31 12:57:27 2013 +0000
tree 9f2e6326534645be96512140c63f291b1340893a
parent 76015b09536c664bd59b370be7691d4b69553d95

update gyp for ARM builds to be more well defined.

R=mtklein@google.com

Review URL: https://codereview.chromium.org/21096005

git-svn-id: http://skia.googlecode.com/svn/trunk@10454 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/opts.gyp

diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 8aa5e0f..010ddfb 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -56,7 +56,7 @@
             '../src/opts/SkUtils_opts_SSE2.cpp',
           ],
         }],
-        [ 'skia_arch_type == "arm" and armv7 == 1', {
+        [ 'skia_arch_type == "arm" and arm_version >= 7', {
           # The assembly uses the frame pointer register (r7 in Thumb/r11 in
           # ARM), the compiler doesn't like that.
           'cflags!': [
@@ -94,7 +94,7 @@
             }],
           ],
         }],
-        [ '(skia_arch_type == "arm" and armv7 == 0) or (skia_os == "ios")', {
+        [ '(skia_arch_type == "arm" and arm_version < 7) or (skia_os == "ios")', {
           'sources': [
             '../src/opts/SkBitmapProcState_opts_none.cpp',
             '../src/opts/SkBlitRow_opts_none.cpp',