diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org> | 2014-09-27 18:10:30 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org> | 2014-09-27 18:10:30 +0000 |
| commit | 870d9bf9b3d38315357afc9ad253b9294f7f9ca8 (patch) | |
| tree | b73722f86fbca4c271294e547c2ac7ed27dc10cf /webrtc_examples.gyp | |
| parent | c66642e3cb89916e5d278d3b441f8823c2a22a06 (diff) | |
| download | webrtc-870d9bf9b3d38315357afc9ad253b9294f7f9ca8.tar.gz | |
Roll chromium_revision 6455c69..deaf2f7 (293954:295079)
Mainly to pick up recent yasm changes needed for
turning on libvpx in GN.
Summary of changes (git diff 6455c69..deaf2f7 DEPS):
* third_party/boringssl 7bdec13..a70c75c
* third_party/libjpeg_turbo 3963fbc..034e9a9
* third_party/libvpx d95585f..4947d55
* tools/gyp 1972:1977
I had to add src/third_party/junit/src to be ignored
due to http://crbug.com/417292.
BUG=3855, chromium:417292
TBR=pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/27539004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7313 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc_examples.gyp')
| -rw-r--r-- | webrtc_examples.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/webrtc_examples.gyp b/webrtc_examples.gyp index 1af259c1..0c7293f8 100644 --- a/webrtc_examples.gyp +++ b/webrtc_examples.gyp @@ -7,6 +7,7 @@ # be found in the AUTHORS file in the root of the source tree. { 'includes': ['build/common.gypi'], + 'targets': [], 'conditions': [ ['OS=="android"', { 'targets': [ |