From f5f5bbf8f92d0a7837f5b458071d6b6855db147c Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 15 Jan 2014 03:15:55 +0000 Subject: [PATCH] Fix neon builds for ios. libyuv_neon macro is not applicable to neon. its only needed for arm code that is not neon but will link to neon. BUG=308 TESTED=try bots R=jzern@chromium.org Review URL: https://webrtc-codereview.appspot.com/7169005 git-svn-id: http://libyuv.googlecode.com/svn/trunk@973 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- libyuv.gyp | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.chromium b/README.chromium index 6cd728662..361a3b33f 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 972 +Version: 973 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index e1d3fdca9..3ae010b22 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 972 +#define LIBYUV_VERSION 973 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/libyuv.gyp b/libyuv.gyp index 3fb7b0835..75851ea16 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -14,7 +14,7 @@ 'use_system_libjpeg%': 0, 'build_neon': 0, 'conditions': [ - ['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { + ['OS == "ios" or (target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1))', { 'build_neon': 1, }], ], @@ -27,9 +27,6 @@ 'target_name': 'libyuv_neon', 'type': 'static_library', 'standalone_static_library': 1, - 'defines': [ - 'LIBYUV_NEON', - ], # TODO(noahric): This should remove whatever mfpu is set, not # just vfpv3-d16. 'cflags!': [