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

Side by Side Diff: webrtc/libjingle_examples.gyp

Issue 1315063005: Fix build when using Xcode 7 which contains .tbd files instead of .dylib (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright 2012 The WebRTC Project Authors. All rights reserved. 2 # Copyright 2012 The WebRTC Project Authors. All rights reserved.
3 # 3 #
4 # Use of this source code is governed by a BSD-style license 4 # Use of this source code is governed by a BSD-style license
5 # that can be found in the LICENSE file in the root of the source 5 # that can be found in the LICENSE file in the root of the source
6 # tree. An additional intellectual property rights grant can be found 6 # tree. An additional intellectual property rights grant can be found
7 # in the file PATENTS. All contributing project authors may 7 # in the file PATENTS. All contributing project authors may
8 # be found in the AUTHORS file in the root of the source tree. 8 # be found in the AUTHORS file in the root of the source tree.
9 9
10 { 10 {
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 'xcode_settings': { 331 'xcode_settings': {
332 'CLANG_ENABLE_OBJC_ARC': 'YES', 332 'CLANG_ENABLE_OBJC_ARC': 'YES',
333 'WARNING_CFLAGS': [ 333 'WARNING_CFLAGS': [
334 '-Wno-deprecated-declarations', 334 '-Wno-deprecated-declarations',
335 ], 335 ],
336 }, 336 },
337 'link_settings': { 337 'link_settings': {
338 'xcode_settings': { 338 'xcode_settings': {
339 'OTHER_LDFLAGS': [ 339 'OTHER_LDFLAGS': [
340 '-framework CFNetwork', 340 '-framework CFNetwork',
341 '-licucore',
341 ], 342 ],
342 }, 343 },
343 'libraries': [
344 '$(SDKROOT)/usr/lib/libicucore.dylib',
345 ],
346 } 344 }
347 }, # target socketrocket 345 }, # target socketrocket
348 ], # targets 346 ], # targets
349 }], # OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.8") 347 }], # OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.8")
350 348
351 ['OS=="android"', { 349 ['OS=="android"', {
352 'targets': [ 350 'targets': [
353 { 351 {
354 'target_name': 'AppRTCDemo', 352 'target_name': 'AppRTCDemo',
355 'type': 'none', 353 'type': 'none',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 'apk_name': 'AppRTCDemoTest', 398 'apk_name': 'AppRTCDemoTest',
401 'java_in_dir': 'examples/androidtests', 399 'java_in_dir': 'examples/androidtests',
402 'is_test_apk': 1, 400 'is_test_apk': 1,
403 }, 401 },
404 'includes': [ '../build/java_apk.gypi' ], 402 'includes': [ '../build/java_apk.gypi' ],
405 }, 403 },
406 ], # targets 404 ], # targets
407 }], # OS=="android" 405 }], # OS=="android"
408 ], 406 ],
409 } 407 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698