From 75dbe9f600e354e7e09a5d93b0fcee5536b85136 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Thu, 13 Sep 2012 16:44:46 +0000 Subject: [PATCH] Only use arm_neon when armv7==1. This corresponds to the Chromium understanding; from build/common.gypi: # Set Neon compilation flags (only meaningful if armv7==1). 'arm_neon%': 1, Review URL: https://webrtc-codereview.appspot.com/802004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2770 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/build/common.gypi | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/build/common.gypi b/src/build/common.gypi index 3d76c1cc69..244175e24e 100644 --- a/src/build/common.gypi +++ b/src/build/common.gypi @@ -150,17 +150,13 @@ ], 'conditions': [ ['armv7==1', { - 'defines': [ - 'WEBRTC_ARCH_ARM_V7', - 'WEBRTC_DETECT_ARM_NEON', - ], - }], - ['arm_neon==1', { - 'defines': [ - 'WEBRTC_ARCH_ARM_NEON', - ], - 'defines!': [ - 'WEBRTC_DETECT_ARM_NEON', + 'defines': ['WEBRTC_ARCH_ARM_V7',], + 'conditions': [ + ['arm_neon==1', { + 'defines': ['WEBRTC_ARCH_ARM_NEON',], + }, { + 'defines': ['WEBRTC_DETECT_ARM_NEON',], + }], ], }], ],