Chromium Code Reviews| 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) { |
| 11 import("//build/config/mac/mac_sdk.gni") | 11 import("//build/config/mac/mac_sdk.gni") |
| 12 import("//build/config/mac/rules.gni") | 12 import("//build/config/mac/rules.gni") |
| 13 } | 13 } |
| 14 if (is_ios) { | 14 if (is_ios) { |
| 15 import("//build/config/ios/rules.gni") | 15 import("//build/config/ios/rules.gni") |
| 16 } | 16 } |
| 17 | 17 |
| 18 if (is_ios || (is_mac && mac_deployment_target == "10.7")) { | 18 if (is_ios || (is_mac && mac_deployment_target == "10.7")) { |
| 19 config("rtc_sdk_common_objc_config") { | 19 config("rtc_sdk_common_objc_config") { |
| 20 include_dirs = [ | 20 include_dirs = [ |
| 21 "objc/Framework/Classes", | 21 "objc/Framework/Classes", |
| 22 "objc/Framework/Headers", | 22 "objc/Framework/Headers", |
| 23 ] | 23 ] |
| 24 } | 24 } |
| 25 | 25 |
| 26 rtc_static_library("rtc_sdk_common_objc") { | 26 rtc_static_library("rtc_sdk_common_objc") { |
| 27 deps = [ | 27 deps = [ |
| 28 "../base:rtc_base", | 28 "../base:rtc_base", |
| 29 ] | 29 ] |
| 30 configs += [ "//build/config/compiler:enable_arc" ] | 30 configs += [ |
| 31 "..:common_objc", | |
| 32 "//build/config/compiler:enable_arc", | |
|
tkchin_webrtc
2016/10/06 20:50:38
enable_arc should be a common objc config I think.
kjellander_webrtc
2016/10/07 05:09:29
If that was possible we certainly should do that.
| |
| 33 ] | |
| 31 public_configs = [ ":rtc_sdk_common_objc_config" ] | 34 public_configs = [ ":rtc_sdk_common_objc_config" ] |
| 32 sources = [ | 35 sources = [ |
| 33 "objc/Framework/Classes/NSString+StdString.h", | 36 "objc/Framework/Classes/NSString+StdString.h", |
| 34 "objc/Framework/Classes/NSString+StdString.mm", | 37 "objc/Framework/Classes/NSString+StdString.mm", |
| 35 "objc/Framework/Classes/RTCDispatcher.m", | 38 "objc/Framework/Classes/RTCDispatcher.m", |
| 36 "objc/Framework/Classes/RTCFieldTrials.mm", | 39 "objc/Framework/Classes/RTCFieldTrials.mm", |
| 37 "objc/Framework/Classes/RTCLogging.mm", | 40 "objc/Framework/Classes/RTCLogging.mm", |
| 38 "objc/Framework/Classes/RTCMetrics.mm", | 41 "objc/Framework/Classes/RTCMetrics.mm", |
| 39 "objc/Framework/Classes/RTCMetricsSampleInfo+Private.h", | 42 "objc/Framework/Classes/RTCMetricsSampleInfo+Private.h", |
| 40 "objc/Framework/Classes/RTCMetricsSampleInfo.mm", | 43 "objc/Framework/Classes/RTCMetricsSampleInfo.mm", |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 327 public_configs = [ ":rtc_sdk_common_objc_config" ] | 330 public_configs = [ ":rtc_sdk_common_objc_config" ] |
| 328 | 331 |
| 329 if (is_clang) { | 332 if (is_clang) { |
| 330 # Suppress warnings from the Chromium Clang plugins. | 333 # Suppress warnings from the Chromium Clang plugins. |
| 331 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 334 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 332 configs -= [ "//build/config/clang:find_bad_constructs" ] | 335 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 333 } | 336 } |
| 334 } | 337 } |
| 335 } | 338 } |
| 336 } | 339 } |
| OLD | NEW |