Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(528)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: talk/build/common.gypi

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Disable sign-compare warning on Win Clang Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« talk/app/webrtc/java/jni/androidmediadecoder_jni.cc ('K') | « talk/app/webrtc/webrtcsessiondescriptionfactory.h ('k') | talk/libjingle.gyp » ('j') | webrtc/media/base/cryptoparams.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/build/common.gypi
diff --git a/talk/build/common.gypi b/talk/build/common.gypi
index 061b06ba70dd7e2274382724e8f84c99b29a7781..028c0066e96cc2b83124d6ada9fa13f7ff73ec36 100644
--- a/talk/build/common.gypi
+++ b/talk/build/common.gypi
@@ -30,7 +30,6 @@
{
'variables': {
'webrtc_root%': '<(DEPTH)/webrtc',
- 'libjingle_tests_additional_deps%': [],
# TODO(ronghuawu): For now, disable the Chrome plugins, which causes a
# flood of chromium-style warnings.
'clang_use_chrome_plugins%': 0,
@@ -43,8 +42,6 @@
'build_expat%': 1,
'build_json%': 1,
'build_libsrtp%': 1,
- 'build_libyuv%': 1,
- 'build_usrsctp%': 1,
# Make it possible to provide custom locations for some libraries.
'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
@@ -65,8 +62,6 @@
# Feature selection
'HAVE_SCTP',
'HAVE_SRTP',
- 'HAVE_WEBRTC_VIDEO',
- 'HAVE_WEBRTC_VOICE',
],
'conditions': [
['OS=="linux"', {
« talk/app/webrtc/java/jni/androidmediadecoder_jni.cc ('K') | « talk/app/webrtc/webrtcsessiondescriptionfactory.h ('k') | talk/libjingle.gyp » ('j') | webrtc/media/base/cryptoparams.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698