generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make building openmax_dl conditional in gyp.

Browse Source 
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
This commit is contained in:
andrew@webrtc.org 2015-03-11 22:06:55 +00:00
parent 8c5ea8a811
commit d2c09dd339
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/build/common.gypi
View File

@ -90,6 +90,7 @@
'build_libvpx%': 1,
'build_vp9%': 1,
'build_ssl%': 1,
'build_openmax_dl%': 1,
# Disable by default
'have_dbus_glib%': 0,

6
webrtc/common_audio/common_audio.gyp
View File

@ -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"', {

2
webrtc/common_audio/real_fourier.cc
View File

@ -12,7 +12,7 @@
#include <cstdlib>
#include "third_party/openmax_dl/dl/sp/api/omxSP.h"
#include "dl/sp/api/omxSP.h"
#include "webrtc/base/checks.h"
namespace webrtc {