| 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 import("//build/config/crypto.gni") | 9 import("//build/config/crypto.gni") | 
| 10 import("//build/config/ui.gni") | 10 import("//build/config/ui.gni") | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 21 config("rtc_base_config") { | 21 config("rtc_base_config") { | 
| 22   include_dirs = [ | 22   include_dirs = [ | 
| 23     "//third_party/jsoncpp/overrides/include", | 23     "//third_party/jsoncpp/overrides/include", | 
| 24     "//third_party/jsoncpp/source/include", | 24     "//third_party/jsoncpp/source/include", | 
| 25   ] | 25   ] | 
| 26 | 26 | 
| 27   defines = [ | 27   defines = [ | 
| 28     "FEATURE_ENABLE_SSL", | 28     "FEATURE_ENABLE_SSL", | 
| 29     "LOGGING=1", | 29     "LOGGING=1", | 
| 30   ] | 30   ] | 
| 31 |  | 
| 32   if (is_posix) { |  | 
| 33     # TODO(henrike): issue 3307, make rtc_base build without disabling |  | 
| 34     # these flags. |  | 
| 35     cflags_cc = [ "-Wno-non-virtual-dtor" ] |  | 
| 36   } |  | 
| 37 } | 31 } | 
| 38 | 32 | 
| 39 config("rtc_base_chromium_config") { | 33 config("rtc_base_chromium_config") { | 
| 40   defines = [ "NO_MAIN_THREAD_WRAPPING" ] | 34   defines = [ "NO_MAIN_THREAD_WRAPPING" ] | 
| 41 } | 35 } | 
| 42 | 36 | 
| 43 config("openssl_config") { | 37 config("openssl_config") { | 
| 44   defines = [ | 38   defines = [ | 
| 45     "SSL_USE_OPENSSL", | 39     "SSL_USE_OPENSSL", | 
| 46     "HAVE_OPENSSL_SSL_H", | 40     "HAVE_OPENSSL_SSL_H", | 
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 463       defines += [ "WEBRTC_EXTERNAL_JSON" ] | 457       defines += [ "WEBRTC_EXTERNAL_JSON" ] | 
| 464     } | 458     } | 
| 465   }  # !build_with_chromium | 459   }  # !build_with_chromium | 
| 466 | 460 | 
| 467   # TODO(henrike): issue 3307, make rtc_base build with the Chromium default | 461   # TODO(henrike): issue 3307, make rtc_base build with the Chromium default | 
| 468   # compiler settings. | 462   # compiler settings. | 
| 469   configs -= [ "//build/config/compiler:chromium_code" ] | 463   configs -= [ "//build/config/compiler:chromium_code" ] | 
| 470   configs += [ "//build/config/compiler:no_chromium_code" ] | 464   configs += [ "//build/config/compiler:no_chromium_code" ] | 
| 471   if (!is_win) { | 465   if (!is_win) { | 
| 472     cflags += [ "-Wno-uninitialized" ] | 466     cflags += [ "-Wno-uninitialized" ] | 
| 473     cflags_cc += [ "-Wno-non-virtual-dtor" ] |  | 
| 474   } | 467   } | 
| 475 | 468 | 
| 476   if (rtc_build_ssl) { | 469   if (rtc_build_ssl) { | 
| 477     deps += [ "//third_party/boringssl" ] | 470     deps += [ "//third_party/boringssl" ] | 
| 478   } else { | 471   } else { | 
| 479     configs += [ "external_ssl_library" ] | 472     configs += [ "external_ssl_library" ] | 
| 480   } | 473   } | 
| 481 | 474 | 
| 482   if (is_android) { | 475   if (is_android) { | 
| 483     sources += [ | 476     sources += [ | 
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 595     defines += [ "timezone=_timezone" ] | 588     defines += [ "timezone=_timezone" ] | 
| 596     sources -= [ "ifaddrs_converter.cc" ] | 589     sources -= [ "ifaddrs_converter.cc" ] | 
| 597   } | 590   } | 
| 598 } | 591 } | 
| 599 | 592 | 
| 600 source_set("gtest_prod") { | 593 source_set("gtest_prod") { | 
| 601   sources = [ | 594   sources = [ | 
| 602     "gtest_prod_util.h", | 595     "gtest_prod_util.h", | 
| 603   ] | 596   ] | 
| 604 } | 597 } | 
| OLD | NEW | 
|---|