summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_nacl.gyp
diff options
context:
space:
mode:
authorjohannkoenig <johannkoenig@google.com>2015-09-18 15:35:25 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-18 22:35:55 +0000
commit5238138a422157576799266228c0c9ee174936ae (patch)
treea112597714c67c981610341f2415456b5f13e63d /remoting/remoting_nacl.gyp
parentbaab86ff3d07870373266e101b0cf8916d4af188 (diff)
downloadchromium_src-5238138a422157576799266228c0c9ee174936ae.zip
chromium_src-5238138a422157576799266228c0c9ee174936ae.tar.gz
chromium_src-5238138a422157576799266228c0c9ee174936ae.tar.bz2
Copy libvpx from DEPS to src
Leaves the previous version in place but updates BUILD.gn and libvpx.gn to point to the new version. This allows decoupling the WebRTC update which is also in DEPS. libvpx DEPS changes ac1772e:0d6551 https://codereview.chromium.org/1339033002 https://chromium-review.googlesource.com/299759 https://codereview.chromium.org/1350853003 https://codereview.chromium.org/1353433003 Copy directory to libvpx_new to avoid breaking bisecting. This allows the user to move between and older and newer revision. A followup to rename libvpx_new to libvpx will come in some ~months because there are additional complications if one tries to sync directly from pre-move to post-rename or the other way around. Remove WATCHLISTS and codereview.settings from _new and use the parent versions. Add DEPS file to enumerate the #include paths. Check out third_party/libvpx_new/source/libvpx directly from upstream project Update all the easy clients of libvpx to depend on the new tree directly. https://chromium.googlesource.com/chromium/deps/libvpx/+/ac1772e3db5c885b554f6a72ca9dbac4245cb0e2 BUG=481034 R=tomfinegan@chromium.org,brettw@chromium.org,phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/1323333002 Cr-Commit-Position: refs/heads/master@{#349789}
Diffstat (limited to 'remoting/remoting_nacl.gyp')
-rw-r--r--remoting/remoting_nacl.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/remoting_nacl.gyp b/remoting/remoting_nacl.gyp
index ab27674..6604231 100644
--- a/remoting/remoting_nacl.gyp
+++ b/remoting/remoting_nacl.gyp
@@ -106,7 +106,7 @@
'../third_party/expat/expat_nacl.gyp:expat_nacl',
'../third_party/khronos/khronos.gyp:khronos_headers',
'../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
- '../third_party/libvpx/libvpx_nacl.gyp:libvpx_nacl',
+ '../third_party/libvpx_new/libvpx_nacl.gyp:libvpx_nacl',
'../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl',
'../third_party/opus/opus_nacl.gyp:opus_nacl',
'remoting_proto_nacl',