talk/build/merge_ios_libs.gyp - Issue 1414573002: Update iOS merge script.

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: talk/build/merge_ios_libs.gyp

Issue 1414573002: Update iOS merge script. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 5 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: talk/build/merge_ios_libs.gyp

diff --git a/talk/build/merge_ios_libs.gyp b/talk/build/merge_ios_libs.gyp

index b9639add7c9910ef565a64fcbf55db41bc92fbac..0c7114da14b7a169d66b0d260946c2106871686e 100644

--- a/talk/build/merge_ios_libs.gyp

+++ b/talk/build/merge_ios_libs.gyp

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

'includes': [ 'objc_app.gypi' ],

'type': 'executable',

'dependencies': [

+ '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',

'../libjingle.gyp:libjingle_peerconnection_objc',

'sources': ['<(DEPTH)/webrtc/build/no_op.cc',],

« no previous file with comments | « talk/build/merge_ios_libs ('k') | no next file » | no next file with comments »