For android arm64 dont specify neon flag.

BUG=364
TESTED=try bots
R=tpsiaki@google.com

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

git-svn-id: http://libyuv.googlecode.com/svn/trunk@1099 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1098
+Version: 1099
 License: BSD
 License File: LICENSE
 

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1098
+#define LIBYUV_VERSION 1099
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT

libyuv.gyp

@@ -54,10 +54,13 @@
                 '-ffat-lto-objects',
               ],
             }],
-          ],
+            # arm64 does not need -mfpu=neon option as neon is not optional
+            ['target_arch != "arm64"', {
               'cflags': [
                 '-mfpu=neon',
               ],
+            }],
+          ],
           'include_dirs': [
             'include',
             '.',
@@ -127,7 +130,17 @@
             'LIBYUV_DISABLE_X86',
           ],
         }],
+        ['OS == "android" and target_arch == "arm64"', {
+          'ldflags': [
+            '-Wl,--dynamic-linker,/system/bin/linker64',
           ],
+        }],
+        ['OS == "android" and target_arch != "arm64"', {
+          'ldflags': [
+            '-Wl,--dynamic-linker,/system/bin/linker',
+          ],
+        }],
+      ], #conditions
       'defines': [
         # Enable the following 3 macros to turn off assembly for specified CPU.
         # 'LIBYUV_DISABLE_X86',