commit a56a2c57cf6f91322fe417c846373c045599db61
author andrew@webrtc.org <andrew@webrtc.org> Wed Nov 26 17:01:40 2014
committer andrew@webrtc.org <andrew@webrtc.org> Wed Nov 26 17:01:40 2014
tree 5547ccd977d222c1b9c037fee4024752fbf2da33
parent 31f7a0e7105a50ca4b00f8c4360f0da1c1957849

Enabling building with NEON on ARM64

This patch enables NEON on ARM64 platform. Passed building both on
Android ARMv7 and Android ARM64.

BUG=3580
R=andrew@webrtc.org, jridges@masque.com

Review URL: https://webrtc-codereview.appspot.com/25069004

Patch from Zhongwei Yao <zhongwei.yao@arm.com>.

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7751 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/BUILD.gn

diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 3f337fd..ea14644 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -122,15 +122,21 @@
 
   if (cpu_arch == "arm64") {
     defines += [ "WEBRTC_ARCH_ARM" ]
+    # TODO(zhongwei) Defining an unique WEBRTC_NEON and
+    # distinguishing ARMv7 NEON and ARM64 NEON by
+    # WEBRTC_ARCH_ARM_V7 and WEBRTC_ARCH_ARM64 should be better.
+
+    # This macro is used to distinguish ARMv7 NEON and ARM64 NEON
+    defines += [ "WEBRTC_ARCH_ARM64_NEON" ]
   }
 
   if (cpu_arch == "arm") {
     defines += [ "WEBRTC_ARCH_ARM" ]
-    if (arm_version == 7) {
+    if (arm_version >= 7) {
       defines += [ "WEBRTC_ARCH_ARM_V7" ]
       if (arm_use_neon) {
         defines += [ "WEBRTC_ARCH_ARM_NEON" ]
-      } else {
+      } else if (is_android) {
         defines += [ "WEBRTC_DETECT_ARM_NEON" ]
       }
     }