| OLD | NEW |
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. |
| 10 | 10 |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 ] | 227 ] |
| 228 } | 228 } |
| 229 | 229 |
| 230 if (use_libfuzzer || use_drfuzz || use_afl) { | 230 if (use_libfuzzer || use_drfuzz || use_afl) { |
| 231 # Used in Chromium's overrides to disable logging | 231 # Used in Chromium's overrides to disable logging |
| 232 defines += [ "WEBRTC_UNSAFE_FUZZER_MODE" ] | 232 defines += [ "WEBRTC_UNSAFE_FUZZER_MODE" ] |
| 233 } | 233 } |
| 234 } | 234 } |
| 235 | 235 |
| 236 config("common_objc") { | 236 config("common_objc") { |
| 237 cflags = [ "-Wobjc-missing-property-synthesis" ] | 237 libs = [ "Foundation.framework" ] |
| 238 | |
| 239 precompiled_header = "sdk/objc/WebRTC-Prefix.pch" | 238 precompiled_header = "sdk/objc/WebRTC-Prefix.pch" |
| 240 precompiled_source = "sdk/objc/WebRTC-Prefix.pch" | 239 precompiled_source = "sdk/objc/WebRTC-Prefix.pch" |
| 241 } | 240 } |
| 242 | 241 |
| 243 if (!is_ios || !build_with_chromium) { | 242 if (!is_ios || !build_with_chromium) { |
| 244 source_set("webrtc") { | 243 source_set("webrtc") { |
| 245 sources = [ | 244 sources = [ |
| 246 "call.h", | 245 "call.h", |
| 247 "config.h", | 246 "config.h", |
| 248 "transport.h", | 247 "transport.h", |
| (...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 774 if (is_ios || (is_mac && target_cpu != "x86")) { | 773 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 775 defines = [ "CARBON_DEPRECATED=YES" ] | 774 defines = [ "CARBON_DEPRECATED=YES" ] |
| 776 } | 775 } |
| 777 if (is_clang) { | 776 if (is_clang) { |
| 778 # Suppress warnings from the Chromium Clang plugin. | 777 # Suppress warnings from the Chromium Clang plugin. |
| 779 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 778 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 780 configs -= [ "//build/config/clang:find_bad_constructs" ] | 779 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 781 } | 780 } |
| 782 } | 781 } |
| 783 } | 782 } |
| OLD | NEW |