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

Unified Diff: all.gyp

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Make the test target inherit the defines for rtc_pc Created 4 years, 10 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
« no previous file with comments | « no previous file | talk/build/common.gypi » ('j') | webrtc/api/peerconnection.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: all.gyp
diff --git a/all.gyp b/all.gyp
index 0b11c8f7d66cc0588df2f7bce65ee1ad7f1734d6..a1acd9294c03b08a12f4630b7ad71b38825e62c9 100644
--- a/all.gyp
+++ b/all.gyp
@@ -18,7 +18,6 @@
'type': 'none',
'dependencies': [
'webrtc/webrtc.gyp:*',
- 'talk/libjingle.gyp:*',
'<@(webrtc_root_additional_dependencies)',
],
'conditions': [
@@ -27,7 +26,7 @@
'webrtc/webrtc_examples.gyp:*',
],
}],
- ['include_tests==1', {
+ ['OS=="ios" or (OS=="mac" and target_arch!="ia32") and include_tests==1', {
Taylor Brandstetter 2016/02/10 22:20:47 Could you explain the purpose of this?
kjellander_webrtc 2016/02/11 12:59:35 Yeah, it was needed since with this CL there's onl
'dependencies': [
'talk/libjingle_tests.gyp:*',
],
« no previous file with comments | « no previous file | talk/build/common.gypi » ('j') | webrtc/api/peerconnection.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698