diff options
| author | andrew@webrtc.org <andrew@webrtc.org> | 2014-10-09 04:13:02 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org> | 2014-10-09 04:13:02 +0000 |
| commit | 5f8f97a4857fa383bfdd0258c49f278127a8ea0f (patch) | |
| tree | 6938c7994f9bbd7f7030141bbe19e7c0e0a350fb /build | |
| parent | d4882626fb50e65ccc2dda1489763605a312c8b3 (diff) | |
| download | webrtc-5f8f97a4857fa383bfdd0258c49f278127a8ea0f.tar.gz | |
Use openmax_dl on all ARM (v7 or higher) platforms.
openmax_dl now works on non-Android ARM, but it still requires
arm_version >= 7, and doesn't work on iOS at all.
TEST=Chromium build for a ChromeOS ARM device passes.
BUG=chromium:415393
R=turaj@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/25829004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7402 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 4 | ||||
| -rw-r--r-- | build/webrtc.gni | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index c5ba41fd..18b33830 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -155,9 +155,7 @@ ['target_arch=="arm" or target_arch=="armv7"', { 'prefer_fixed_point%': 1, }], - # TODO(ajm): Workaround until openmax_dl has non-Android ARM support. - # See: crbug.com/415393 - ['OS!="ios" and (target_arch!="arm" or OS=="android")', { + ['OS!="ios" and (target_arch!="arm" or arm_version>=7)', { 'rtc_use_openmax_dl%': 1, }, { 'rtc_use_openmax_dl%': 0, diff --git a/build/webrtc.gni b/build/webrtc.gni index e0f69249..0f10c0c3 100644 --- a/build/webrtc.gni +++ b/build/webrtc.gni @@ -103,9 +103,7 @@ declare_args() { rtc_prefer_fixed_point = true } - # TODO(ajm): Workaround until openmax_dl has non-Android ARM support. - # See: crbug.com/415393 - if (!is_ios && (cpu_arch != "arm" || is_android)) { + if (!is_ios && (cpu_arch != "arm" || arm_version >= 7)) { rtc_use_openmax_dl = true } else { rtc_use_openmax_dl = false |