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
This commit is contained in:
fbarchard@google.com 2014-01-14 01:23:51 +00:00
parent 0d8da8a372
commit 252e14a8a5
3 changed files with 4 additions and 4 deletions

View File

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

View File

@ -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

View File

@ -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,
}],
],