From 6ee7a0903f42cf4072126bae371c35839c9d0ce4 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 29 May 2014 17:00:28 +0000 Subject: cleanup gyp common_variables R=bungeman@google.com Review URL: https://codereview.chromium.org/301173002 git-svn-id: http://skia.googlecode.com/svn/trunk@14965 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp/common_variables.gypi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 61efe92eec..c8b069ce68 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -48,6 +48,8 @@ 'skia_android_framework%': 0, 'skia_arch_type%': 'x86', + 'arm_version%': 0, + 'arm_neon%': 0, }, # Re-define all variables defined within the level-3 'variables' dict, @@ -55,6 +57,8 @@ # (skia_os will depend on skia_android_framework.) 'skia_android_framework%': '<(skia_android_framework)', 'skia_arch_type%': '<(skia_arch_type)', + 'arm_version%': '<(arm_version)', + 'arm_neon%': '<(arm_neon)', 'conditions': [ [ 'skia_android_framework == 1', { @@ -92,10 +96,6 @@ 'skia_arch_type%': 'arm', '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', - 'arm_version%': 0, - 'arm_neon%': 0, }], [ 'skia_os in ["android", "nacl"] and not skia_android_framework', # skia_freetype_static - on OS variants that normally would -- cgit v1.2.3