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
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index d7d41f2..8965c82 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -69,11 +69,11 @@
}],
[ 'skia_os == "ios"', {
'skia_arch_type%': 'arm',
- 'armv7%': 1,
+ 'arm_version%': 7,
'arm_neon%': 0, # neon asm files known not to work with the ios build
},{ # skia_os is not ios
'skia_arch_type%': 'x86',
- 'armv7%': 0,
+ 'arm_version%': 0,
'arm_neon%': 0,
}],
],
@@ -121,8 +121,9 @@
# Re-define all variables defined within the level-2 'variables' dict,
# so that siblings of the level-1 'variables' dict can see them.
- 'armv7%': '<(armv7)',
+ 'arm_version%': '<(arm_version)',
'arm_neon%': '<(arm_neon)',
+ 'arm_neon_optional%': 0,
'skia_os%': '<(skia_os)',
'os_posix%': '<(os_posix)',
'skia_scalar%': '<(skia_scalar)',