summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_nacl.gyp
diff options
context:
space:
mode:
authorReilly Grant <reillyg@chromium.org>2014-12-19 12:47:29 -0800
committerReilly Grant <reillyg@chromium.org>2014-12-19 20:48:26 +0000
commitc05c55fd521bda00838b215304d10891ca8e8471 (patch)
treeb87a385923e05c769195ea34ed64d662954901ff /remoting/remoting_nacl.gyp
parent8ce475eea02919bb638c969232b755de99800315 (diff)
downloadchromium_src-c05c55fd521bda00838b215304d10891ca8e8471.zip
chromium_src-c05c55fd521bda00838b215304d10891ca8e8471.tar.gz
chromium_src-c05c55fd521bda00838b215304d10891ca8e8471.tar.bz2
Revert "Remove libwebm third_party dependency."
This reverts commit c053fb4fec709c4a5a72065305ee4eb2da2efaa8. BUG= TBR=sergeyu@chromium.org Review URL: https://codereview.chromium.org/813423002 Cr-Commit-Position: refs/heads/master@{#309248}
Diffstat (limited to 'remoting/remoting_nacl.gyp')
-rw-r--r--remoting/remoting_nacl.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/remoting/remoting_nacl.gyp b/remoting/remoting_nacl.gyp
index cabdb92..b9000ba 100644
--- a/remoting/remoting_nacl.gyp
+++ b/remoting/remoting_nacl.gyp
@@ -106,6 +106,7 @@
'../net/net_nacl.gyp:net_nacl',
'../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
'../third_party/libvpx/libvpx_nacl.gyp:libvpx_nacl',
+ '../third_party/libwebm/libwebm_nacl.gyp:libwebm_nacl',
'../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl',
'../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
'../third_party/opus/opus_nacl.gyp:opus_nacl',
@@ -169,6 +170,7 @@
'>(tc_lib_dir_pnacl_newlib)/libremoting_webrtc_nacl.a',
'>(tc_lib_dir_pnacl_newlib)/liburl_nacl.a',
'>(tc_lib_dir_pnacl_newlib)/libvpx_nacl.a',
+ '>(tc_lib_dir_pnacl_newlib)/libwebm_nacl.a',
'>(tc_lib_dir_pnacl_newlib)/libyuv_nacl.a',
],
},
@@ -189,6 +191,7 @@
'../third_party/icu/icu_nacl.gyp:icui18n_nacl',
'../third_party/icu/icu_nacl.gyp:icuuc_nacl',
'../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
+ '../third_party/libwebm/libwebm_nacl.gyp:libwebm_nacl',
'../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl',
'../third_party/modp_b64/modp_b64_nacl.gyp:modp_b64_nacl',
'../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',