From 34ac956706664e553764b8c8589d8ec6ce509635 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Tue, 30 Dec 2014 18:19:56 +0000 Subject: [PATCH] Do not use openmax_dl for MIPS64 platform. This fix is intended for MIPS64 Chromium Android builds, which has no openmax_dl support at this moment. R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/31339004 Patch from Ljubomir Papuga . git-svn-id: http://webrtc.googlecode.com/svn/trunk@7983 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/common.gypi | 2 +- webrtc/build/webrtc.gni | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 85a0cf6c7f..4322f37d38 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -150,7 +150,7 @@ ['target_arch=="arm" or target_arch=="arm64"', { 'prefer_fixed_point%': 1, }], - ['OS!="ios" and (target_arch!="arm" or arm_version>=7)', { + ['OS!="ios" and (target_arch!="arm" or arm_version>=7) and target_arch!="mips64el"', { 'rtc_use_openmax_dl%': 1, }, { 'rtc_use_openmax_dl%': 0, diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni index 95538f64a6..e687af861a 100644 --- a/webrtc/build/webrtc.gni +++ b/webrtc/build/webrtc.gni @@ -103,6 +103,8 @@ declare_args() { rtc_prefer_fixed_point = true } + # TODO(ljubomir): Unset rtc_use_openmax_dl for mips64el once mips64el gets + # supported in GN (since openmax_dl is not supported for mips64el). if (!is_ios && (cpu_arch != "arm" || arm_version >= 7)) { rtc_use_openmax_dl = true } else {