use arm only to determine if neon should be build

BUG=307
TESTED=try bots
R=yfriedman@chromium.org

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

git-svn-id: http://libyuv.googlecode.com/svn/trunk@971 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2014-01-14 01:48:47 +00:00
parent 252e14a8a5
commit d3f1821b47
3 changed files with 3 additions and 4 deletions

View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 969 Version: 971
License: BSD License: BSD
License File: LICENSE License File: LICENSE

View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 969 #define LIBYUV_VERSION 971
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

View File

@ -14,8 +14,7 @@
'use_system_libjpeg%': 0, 'use_system_libjpeg%': 0,
'build_neon': 0, 'build_neon': 0,
'conditions': [ 'conditions': [
['OS == "ios" or ['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', {
(OS == "android" and target_arch == "arm" and arm_version >= 7)', {
'build_neon': 1, 'build_neon': 1,
}], }],
], ],