third_party/libjingle/libjingle_nacl.gyp - Issue 653203005: Roll WebRTC 7546:7549.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/libjingle/libjingle_nacl.gyp

Issue 653203005: Roll WebRTC 7546:7549. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Decreased the number of gyp changes in this patch since thats the only major change (the reset is j… Created 6 years, 2 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:

Index: third_party/libjingle/libjingle_nacl.gyp

diff --git a/third_party/libjingle/libjingle_nacl.gyp b/third_party/libjingle/libjingle_nacl.gyp

index 9c474efccd263e24054e22823e021ce2ddb7da37..3802aef1ee5226159bc352035d6b60cbe3c508da 100644

--- a/third_party/libjingle/libjingle_nacl.gyp

+++ b/third_party/libjingle/libjingle_nacl.gyp

@@ -7,6 +7,7 @@

'libjingle_source': "source",

'webrtc_base': "../webrtc/base",

'webrtc_xmllite': "../webrtc/libjingle/xmllite",

+ 'webrtc_p2p': "../webrtc/p2p",

'includes': [

'../../native_client/build/untrusted.gypi',

@@ -248,8 +249,8 @@

'sources!': [

# Compiled as part of libjingle_p2p_constants_nacl.

- '<(libjingle_source)/talk/p2p/base/constants.cc',

- '<(libjingle_source)/talk/p2p/base/constants.h',

+ '<(webrtc_p2p)/base/constants.cc',

+ '<(webrtc_p2p)/base/constants.h',

'sources/': [

['exclude', '/mac[a-z]+\\.(h|cc)$'],

@@ -312,8 +313,8 @@

'../'

'sources': [

- '<(libjingle_source)/talk/p2p/base/constants.cc',

- '<(libjingle_source)/talk/p2p/base/constants.h',

+ '<(webrtc_p2p)/base/constants.cc',

+ '<(webrtc_p2p)/base/constants.h',

}, # end of target 'libjingle_p2p_constants_nacl'

« no previous file with comments | « third_party/libjingle/libjingle_common.gypi ('k') | no next file » | no next file with comments »