Index: remoting/remoting.gyp |
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp |
index 325313ba40406b33cad3b77b44bdac39df87e59f..53918958ab5e280442e0a0b78025139f67ca0c35 100644 |
--- a/remoting/remoting.gyp |
+++ b/remoting/remoting.gyp |
@@ -165,6 +165,7 @@ |
'remoting_base', |
'remoting_host', |
'remoting_jingle_glue', |
+ '../third_party/libvpx/libvpx.gyp:libvpx', |
'../third_party/npapi/npapi.gyp:npapi', |
], |
'sources': [ |
@@ -213,15 +214,6 @@ |
'host/plugin/host_plugin.rc', |
], |
}], |
- ['target_arch=="arm"', { |
- 'dependencies': [ |
- '../third_party/libvpx/libvpx.gyp:libvpx_lib', |
- ], |
- }, { |
- 'dependencies': [ |
- '../third_party/libvpx/libvpx.gyp:libvpx', |
- ], |
- }], |
], |
}, # end of target 'remoting_host_plugin' |
{ |
@@ -283,7 +275,6 @@ |
'../ui/ui.gyp:ui', |
'../net/net.gyp:net', |
'../third_party/protobuf/protobuf.gyp:protobuf_lite', |
- '../third_party/libvpx/libvpx.gyp:libvpx_include', |
'../third_party/zlib/zlib.gyp:zlib', |
'../media/media.gyp:yuv_convert', |
'remoting_jingle_glue', |
@@ -298,6 +289,11 @@ |
'../third_party/protobuf/protobuf.gyp:protobuf_lite', |
'proto/chromotocol.gyp:chromotocol_proto_lib', |
], |
+ # TODO(hclam): Remove this and depend on libvpx directly once we remove |
+ # libvpx from FFmpeg. |
+ 'include_dirs': [ |
+ '../third_party/libvpx/source/libvpx', |
+ ], |
# This target needs a hard dependency because dependent targets |
# depend on chromotocol_proto_lib for headers. |
'hard_dependency': 1, |