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

Side by Side Diff: talk/libjingle.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/build/merge_ios_libs.gyp ('k') | talk/libjingle_tests.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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 'app/webrtc/java/android', 241 'app/webrtc/java/android',
242 '<(webrtc_base_dir)/java/src', 242 '<(webrtc_base_dir)/java/src',
243 '<(webrtc_modules_dir)/audio_device/android/java/src', 243 '<(webrtc_modules_dir)/audio_device/android/java/src',
244 '<(webrtc_modules_dir)/video_render/android/java/src', 244 '<(webrtc_modules_dir)/video_render/android/java/src',
245 ], 245 ],
246 }, 246 },
247 'includes': ['../build/java.gypi'], 247 'includes': ['../build/java.gypi'],
248 }, # libjingle_peerconnection_java 248 }, # libjingle_peerconnection_java
249 ] 249 ]
250 }], 250 }],
251 ['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.7")', { 251 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
252 # The >= 10.7 above is required for ARC. 252 # The >= 10.7 above is required for ARC.
253 'targets': [ 253 'targets': [
254 { 254 {
255 'target_name': 'libjingle_peerconnection_objc', 255 'target_name': 'libjingle_peerconnection_objc',
256 'type': 'static_library', 256 'type': 'static_library',
257 'dependencies': [ 257 'dependencies': [
258 'libjingle_peerconnection', 258 'libjingle_peerconnection',
259 ], 259 ],
260 'sources': [ 260 'sources': [
261 'app/webrtc/objc/RTCAudioTrack+Internal.h', 261 'app/webrtc/objc/RTCAudioTrack+Internal.h',
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 ['OS=="android" and build_with_chromium==0', { 793 ['OS=="android" and build_with_chromium==0', {
794 'sources': [ 794 'sources': [
795 'app/webrtc/androidvideocapturer.h', 795 'app/webrtc/androidvideocapturer.h',
796 'app/webrtc/androidvideocapturer.cc', 796 'app/webrtc/androidvideocapturer.cc',
797 ], 797 ],
798 }], 798 }],
799 ], 799 ],
800 }, # target libjingle_peerconnection 800 }, # target libjingle_peerconnection
801 ], 801 ],
802 } 802 }
OLDNEW
« no previous file with comments | « talk/build/merge_ios_libs.gyp ('k') | talk/libjingle_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698