From d2c09dd33957434a4fe6ff48eebc33912ea10abd Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Wed, 11 Mar 2015 22:06:55 +0000 Subject: [PATCH] Make building openmax_dl conditional in gyp. Intentionally not modifying the GN build. R=kjellander@webrtc.org Review URL: https://webrtc-codereview.appspot.com/48479004 Cr-Commit-Position: refs/heads/master@{#8688} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8688 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/common.gypi | 1 + webrtc/common_audio/common_audio.gyp | 6 ++++-- webrtc/common_audio/real_fourier.cc | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 9fec935bc8..df6c7e3005 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -90,6 +90,7 @@ 'build_libvpx%': 1, 'build_vp9%': 1, 'build_ssl%': 1, + 'build_openmax_dl%': 1, # Disable by default 'have_dbus_glib%': 0, diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp index f7bc3a80e7..3ea336c202 100644 --- a/webrtc/common_audio/common_audio.gyp +++ b/webrtc/common_audio/common_audio.gyp @@ -118,8 +118,10 @@ 'real_fourier.cc', 'real_fourier.h', ], - 'dependencies': [ - '<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl', + 'conditions': [ + ['build_openmax_dl==1', { + 'dependencies': ['<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl',], + }], ], }], ['target_arch=="ia32" or target_arch=="x64"', { diff --git a/webrtc/common_audio/real_fourier.cc b/webrtc/common_audio/real_fourier.cc index 6933ea7ad2..81fd45cb6b 100644 --- a/webrtc/common_audio/real_fourier.cc +++ b/webrtc/common_audio/real_fourier.cc @@ -12,7 +12,7 @@ #include -#include "third_party/openmax_dl/dl/sp/api/omxSP.h" +#include "dl/sp/api/omxSP.h" #include "webrtc/base/checks.h" namespace webrtc {