The libvpx in chromium doesn't support the ARM build, so we have to use the pre-built libvpx instead.
Ref: http://src.chromium.org/viewvc/chrome/trunk/src/remoting/remoting.gyp?view=markup Review URL: http://webrtc-codereview.appspot.com/74006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@218 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
b7540b0322
commit
ddbe649253
@ -21,23 +21,32 @@
|
||||
],
|
||||
'conditions': [
|
||||
['build_with_chromium==1', {
|
||||
'conditions': [
|
||||
['OS=="win"', {
|
||||
'dependencies': [
|
||||
# We don't want to link with the static library inside Chromium
|
||||
# on Windows. Chromium uses the ffmpeg DLL and exports the
|
||||
# necessary libvpx symbols for us.
|
||||
'../../../../../../../libvpx/libvpx.gyp:libvpx_include',
|
||||
],
|
||||
},{
|
||||
'dependencies': [
|
||||
'../../../../../../../libvpx/libvpx.gyp:libvpx',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../../../../../../../libvpx/source/libvpx',
|
||||
],
|
||||
}],
|
||||
],
|
||||
'conditions': [
|
||||
['target_arch=="arm"', {
|
||||
'dependencies': [
|
||||
'../../../../../../../libvpx/libvpx.gyp:libvpx_lib',
|
||||
'../../../../../../../libvpx/libvpx.gyp:libvpx_include',
|
||||
],
|
||||
}, { # arm
|
||||
'conditions': [
|
||||
['OS=="win"', {
|
||||
'dependencies': [
|
||||
# We don't want to link with the static library inside Chromium
|
||||
# on Windows. Chromium uses the ffmpeg DLL and exports the
|
||||
# necessary libvpx symbols for us.
|
||||
'../../../../../../../libvpx/libvpx.gyp:libvpx_include',
|
||||
],
|
||||
},{ # non-arm, win
|
||||
'dependencies': [
|
||||
'../../../../../../../libvpx/libvpx.gyp:libvpx',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../../../../../../../libvpx/source/libvpx',
|
||||
],
|
||||
}], # non-arm, non-win
|
||||
],
|
||||
}],
|
||||
],
|
||||
},{
|
||||
'dependencies': [
|
||||
'../../../../../../../third_party/libvpx/libvpx.gyp:libvpx',
|
||||
|
Loading…
x
Reference in New Issue
Block a user