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

Side by Side Diff: talk/libjingle_tests.gyp

Issue 1493003002: Fix Mac ObjC PeerConnection API compilation. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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 | « talk/libjingle.gyp ('k') | webrtc/webrtc_examples.gyp » ('j') | 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 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 'java_in_dir': 'app/webrtc/androidtests', 325 'java_in_dir': 'app/webrtc/androidtests',
326 'resource_dir': 'app/webrtc/androidtests/res', 326 'resource_dir': 'app/webrtc/androidtests/res',
327 'additional_src_dirs': ['app/webrtc/java/testcommon'], 327 'additional_src_dirs': ['app/webrtc/java/testcommon'],
328 'native_lib_target': 'libjingle_peerconnection_so', 328 'native_lib_target': 'libjingle_peerconnection_so',
329 'is_test_apk': 1, 329 'is_test_apk': 1,
330 }, 330 },
331 'includes': [ '../build/java_apk.gypi' ], 331 'includes': [ '../build/java_apk.gypi' ],
332 }, 332 },
333 ], # targets 333 ], # targets
334 }], # OS=="android" 334 }], # OS=="android"
335 ['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.7")', { 335 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
336 # The >=10.7 above is required to make ARC link cleanly (e.g. as 336 # The >=10.7 above is required to make ARC link cleanly (e.g. as
337 # opposed to _compile_ cleanly, which the library under test 337 # opposed to _compile_ cleanly, which the library under test
338 # does just fine on 10.6 too). 338 # does just fine on 10.6 too).
339 'targets': [ 339 'targets': [
340 { 340 {
341 'target_name': 'libjingle_peerconnection_objc_test', 341 'target_name': 'libjingle_peerconnection_objc_test',
342 'type': 'executable', 342 'type': 'executable',
343 'includes': [ 'build/objc_app.gypi' ], 343 'includes': [ 'build/objc_app.gypi' ],
344 'dependencies': [ 344 'dependencies': [
345 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', 345 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 'build/isolate.gypi', 431 'build/isolate.gypi',
432 ], 432 ],
433 'sources': [ 433 'sources': [
434 'libjingle_peerconnection_unittest.isolate', 434 'libjingle_peerconnection_unittest.isolate',
435 ], 435 ],
436 }, 436 },
437 ], 437 ],
438 }], 438 }],
439 ], 439 ],
440 } 440 }
OLDNEW
« no previous file with comments | « talk/libjingle.gyp ('k') | webrtc/webrtc_examples.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698