| OLD | NEW | 
|---|
| 1 # Copyright 2016 The WebRTC project authors. All Rights Reserved. | 1 # Copyright 2016 The WebRTC project authors. All Rights Reserved. | 
| 2 # | 2 # | 
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license | 
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source | 
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found | 
| 6 # in the file PATENTS.  All contributing project authors may | 6 # in the file PATENTS.  All contributing project authors may | 
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. | 
| 8 | 8 | 
| 9 import("../build/webrtc.gni") | 9 import("../build/webrtc.gni") | 
| 10 if (is_mac) { | 10 if (is_mac) { | 
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 61       libs = [ "AVFoundation.framework" ] | 61       libs = [ "AVFoundation.framework" ] | 
| 62     } | 62     } | 
| 63     if (!build_with_chromium) { | 63     if (!build_with_chromium) { | 
| 64       sources += [ | 64       sources += [ | 
| 65         "objc/Framework/Classes/RTCFileLogger.mm", | 65         "objc/Framework/Classes/RTCFileLogger.mm", | 
| 66         "objc/Framework/Headers/WebRTC/RTCFileLogger.h", | 66         "objc/Framework/Headers/WebRTC/RTCFileLogger.h", | 
| 67       ] | 67       ] | 
| 68     } | 68     } | 
| 69   } | 69   } | 
| 70 | 70 | 
|  | 71   config("rtc_sdk_peerconnection_objc_warnings_config") { | 
|  | 72     if (is_clang) { | 
|  | 73       # TODO(tkchin): Make rtc_sdk_peerconnection_objc compile with the standard | 
|  | 74       # set of warnings. | 
|  | 75       # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6308 | 
|  | 76       cflags = [ "-Wno-thread-safety-analysis" ] | 
|  | 77     } | 
|  | 78   } | 
|  | 79 | 
| 71   rtc_source_set("rtc_sdk_peerconnection_objc") { | 80   rtc_source_set("rtc_sdk_peerconnection_objc") { | 
| 72     sources = [ | 81     sources = [ | 
| 73       "objc/Framework/Classes/RTCAVFoundationVideoSource+Private.h", | 82       "objc/Framework/Classes/RTCAVFoundationVideoSource+Private.h", | 
| 74       "objc/Framework/Classes/RTCAVFoundationVideoSource.mm", | 83       "objc/Framework/Classes/RTCAVFoundationVideoSource.mm", | 
| 75       "objc/Framework/Classes/RTCAudioSource+Private.h", | 84       "objc/Framework/Classes/RTCAudioSource+Private.h", | 
| 76       "objc/Framework/Classes/RTCAudioSource.mm", | 85       "objc/Framework/Classes/RTCAudioSource.mm", | 
| 77       "objc/Framework/Classes/RTCAudioTrack+Private.h", | 86       "objc/Framework/Classes/RTCAudioTrack+Private.h", | 
| 78       "objc/Framework/Classes/RTCAudioTrack.mm", | 87       "objc/Framework/Classes/RTCAudioTrack.mm", | 
| 79       "objc/Framework/Classes/RTCConfiguration+Private.h", | 88       "objc/Framework/Classes/RTCConfiguration+Private.h", | 
| 80       "objc/Framework/Classes/RTCConfiguration.mm", | 89       "objc/Framework/Classes/RTCConfiguration.mm", | 
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 178         "objc/Framework/Classes/RTCNSGLVideoView.m", | 187         "objc/Framework/Classes/RTCNSGLVideoView.m", | 
| 179         "objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h", | 188         "objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h", | 
| 180       ] | 189       ] | 
| 181       libs = [ | 190       libs = [ | 
| 182         "CoreMedia.framework", | 191         "CoreMedia.framework", | 
| 183         "OpenGL.framework", | 192         "OpenGL.framework", | 
| 184       ] | 193       ] | 
| 185     } | 194     } | 
| 186 | 195 | 
| 187     configs += [ | 196     configs += [ | 
|  | 197       ":rtc_sdk_peerconnection_objc_warnings_config", | 
| 188       "..:common_objc", | 198       "..:common_objc", | 
| 189       "//build/config/compiler:enable_arc", | 199       "//build/config/compiler:enable_arc", | 
| 190     ] | 200     ] | 
| 191 | 201 | 
| 192     # TODO(tkchin): Make rtc_sdk_peerconnection_objc compile with the standard |  | 
| 193     # set of warnings. |  | 
| 194     # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6308 |  | 
| 195     suppressed_configs += [ rtc_common_config ] |  | 
| 196 |  | 
| 197     public_configs = [ ":rtc_sdk_common_objc_config" ] | 202     public_configs = [ ":rtc_sdk_common_objc_config" ] | 
| 198 | 203 | 
| 199     if (is_clang) { | 204     if (is_clang) { | 
| 200       # Suppress warnings from the Chromium Clang plugins. | 205       # Suppress warnings from the Chromium Clang plugins. | 
| 201       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 206       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 202       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 207       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 203     } | 208     } | 
| 204 | 209 | 
| 205     libs += [ "AVFoundation.framework" ] | 210     libs += [ "AVFoundation.framework" ] | 
| 206 | 211 | 
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 328       public_configs = [ ":rtc_sdk_common_objc_config" ] | 333       public_configs = [ ":rtc_sdk_common_objc_config" ] | 
| 329 | 334 | 
| 330       if (is_clang) { | 335       if (is_clang) { | 
| 331         # Suppress warnings from the Chromium Clang plugins. | 336         # Suppress warnings from the Chromium Clang plugins. | 
| 332         # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 337         # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 333         configs -= [ "//build/config/clang:find_bad_constructs" ] | 338         configs -= [ "//build/config/clang:find_bad_constructs" ] | 
| 334       } | 339       } | 
| 335     } | 340     } | 
| 336   } | 341   } | 
| 337 } | 342 } | 
| OLD | NEW | 
|---|