diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-11-04 15:21:41 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-11-04 15:21:41 +0000 |
commit | 6651f18386d5bd9870d621ace2a11dec1cb68c80 (patch) | |
tree | 940b095a69f4c43993cdf329d0aa6a8702b9ab3d /webrtc.gyp | |
parent | 2dc72e3be449734e64ff706df1765ac1bfe64b23 (diff) | |
parent | a1fd19c12e4efdf4b8a5f92323070443d50dc34e (diff) | |
download | webrtc-6651f18386d5bd9870d621ace2a11dec1cb68c80.tar.gz |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at a1fd19c12e4efdf4b8a5f92323070443d50dc34e
This commit was generated by merge_from_chromium.py.
Change-Id: Ibd48eca2d93e6324a2e886e451f27307aab45e9b
Diffstat (limited to 'webrtc.gyp')
-rw-r--r-- | webrtc.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -36,6 +36,7 @@ 'video_engine/video_engine.gyp:*', 'voice_engine/voice_engine.gyp:*', '<(webrtc_vp8_dir)/vp8.gyp:*', + '<(webrtc_vp9_dir)/vp9.gyp:*', ], }, 'targets': [ |