From 0001adcfef93492ebfa278dcd12a6a913419157b Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Thu, 9 Oct 2014 04:13:02 +0000 Subject: [PATCH] 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@7402 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/common.gypi | 4 +--- webrtc/build/webrtc.gni | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index c5ba41fd22..18b33830dd 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/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/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni index e0f69249b6..0f10c0c390 100644 --- a/webrtc/build/webrtc.gni +++ b/webrtc/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