From 252e14a8a57e0a68bb61fe266a5ff15a0ed79451 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Tue, 14 Jan 2014 01:23:51 +0000 Subject: [PATCH] check target arch is arm for neon code on android BUG=307 TESTED=untested R=michaelbai@chromium.org, noahric@chromium.org, yfriedman@chromium.org Review URL: https://webrtc-codereview.appspot.com/7089005 git-svn-id: http://libyuv.googlecode.com/svn/trunk@970 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- libyuv.gyp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.chromium b/README.chromium index 3e2a65eb7..bf91932e2 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 968 +Version: 969 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 5d33ed671..65a661074 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 968 +#define LIBYUV_VERSION 969 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/libyuv.gyp b/libyuv.gyp index f2cb8cdd5..a236c956d 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -14,8 +14,8 @@ 'use_system_libjpeg%': 0, 'build_neon': 0, 'conditions': [ - ['OS == "android" or OS == "ios"', { - # TODO(noahric): Also check tool version for armv7 + ['OS == "ios" or + (OS == "android" and target_arch == "arm" and arm_version >= 7)', { 'build_neon': 1, }], ],