Chromium Code Reviews| 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 if (is_win) { | 9 import("../../webrtc/build/webrtc.gni") |
|
kjellander_webrtc
2016/09/08 12:48:35
Line 9-13 + 80 are the only added lines, the rest
| |
| 10 gflags_gen_arch_root = "gen/win" | |
| 11 } else { | |
| 12 gflags_gen_arch_root = "gen/posix" | |
| 13 } | |
| 14 | 10 |
| 15 config("gflags_config") { | 11 # gflags can only be used by targets that are not built in Chromium, since |
| 16 include_dirs = [ | 12 # Chromium doesn't have gflags as a dependency). |
| 17 "$gflags_gen_arch_root/include", # For configured files. | 13 if (!build_with_chromium && !use_libfuzzer) { |
| 18 "src/src", # For everything else. | 14 if (is_win) { |
| 19 ] | 15 gflags_gen_arch_root = "gen/win" |
| 16 } else { | |
| 17 gflags_gen_arch_root = "gen/posix" | |
| 18 } | |
| 20 | 19 |
| 21 defines = [ | 20 config("gflags_config") { |
| 22 # These macros exist so flags and symbols are properly exported when | 21 include_dirs = [ |
| 23 # building DLLs. Since we don't build DLLs, we need to disable them. | 22 "$gflags_gen_arch_root/include", # For configured files. |
| 24 "GFLAGS_DLL_DECL=", | 23 "src/src", # For everything else. |
| 25 "GFLAGS_DLL_DECLARE_FLAG=", | 24 ] |
| 26 "GFLAGS_DLL_DEFINE_FLAG=", | |
| 27 ] | |
| 28 | 25 |
| 29 # GN orders flags on a target before flags from configs. The default config | 26 defines = [ |
| 30 # adds -Wall, and this flag have to be after -Wall -- so they need to | 27 # These macros exist so flags and symbols are properly exported when |
| 31 # come from a config and can't be on the target directly. | 28 # building DLLs. Since we don't build DLLs, we need to disable them. |
| 32 if (is_clang) { | 29 "GFLAGS_DLL_DECL=", |
| 33 cflags = [ "-Wno-unused-local-typedef" ] | 30 "GFLAGS_DLL_DECLARE_FLAG=", |
| 31 "GFLAGS_DLL_DEFINE_FLAG=", | |
| 32 ] | |
| 33 | |
| 34 # GN orders flags on a target before flags from configs. The default config | |
| 35 # adds -Wall, and this flag have to be after -Wall -- so they need to | |
| 36 # come from a config and can't be on the target directly. | |
| 37 if (is_clang) { | |
| 38 cflags = [ "-Wno-unused-local-typedef" ] | |
| 39 } | |
| 40 } | |
| 41 | |
| 42 source_set("gflags") { | |
| 43 testonly = true | |
|
kjellander_webrtc
2016/09/08 12:48:35
I added this too, doesn't hurt.
| |
| 44 cflags = [] | |
| 45 sources = [ | |
| 46 "src/src/gflags.cc", | |
| 47 "src/src/gflags_completions.cc", | |
| 48 "src/src/gflags_reporting.cc", | |
| 49 ] | |
| 50 if (is_win) { | |
| 51 sources += [ "src/src/windows_port.cc" ] | |
| 52 | |
| 53 cflags += [ | |
| 54 "/wd4005", # WIN32_LEAN_AND_MEAN. | |
| 55 "/wd4267", # Conversion from size_t to "type". | |
| 56 ] | |
| 57 } | |
| 58 | |
| 59 include_dirs = [ | |
| 60 "$gflags_gen_arch_root/include/gflags", # For configured files. | |
| 61 "$gflags_gen_arch_root/include/private", # For config.h | |
| 62 ] | |
| 63 | |
| 64 public_configs = [ ":gflags_config" ] | |
| 65 | |
| 66 configs -= [ "//build/config/compiler:chromium_code" ] | |
| 67 configs += [ "//build/config/compiler:no_chromium_code" ] | |
| 68 | |
| 69 if (is_win) { | |
| 70 configs -= [ "//build/config/win:unicode" ] | |
| 71 } | |
| 72 | |
| 73 if (is_clang) { | |
| 74 # TODO(andrew): Look into fixing this warning upstream: | |
| 75 # http://code.google.com/p/webrtc/issues/detail?id=760 | |
| 76 configs -= [ "//build/config/clang:extra_warnings" ] | |
| 77 cflags += [ "-Wno-microsoft-include" ] | |
| 78 } | |
| 34 } | 79 } |
| 35 } | 80 } |
| 36 | |
| 37 source_set("gflags") { | |
| 38 cflags = [] | |
| 39 sources = [ | |
| 40 "src/src/gflags.cc", | |
| 41 "src/src/gflags_completions.cc", | |
| 42 "src/src/gflags_reporting.cc", | |
| 43 ] | |
| 44 if (is_win) { | |
| 45 sources += [ "src/src/windows_port.cc" ] | |
| 46 | |
| 47 cflags += [ | |
| 48 "/wd4005", # WIN32_LEAN_AND_MEAN. | |
| 49 "/wd4267", # Conversion from size_t to "type". | |
| 50 ] | |
| 51 } | |
| 52 | |
| 53 include_dirs = [ | |
| 54 "$gflags_gen_arch_root/include/gflags", # For configured files. | |
| 55 "$gflags_gen_arch_root/include/private", # For config.h | |
| 56 ] | |
| 57 | |
| 58 public_configs = [ ":gflags_config" ] | |
| 59 | |
| 60 configs -= [ "//build/config/compiler:chromium_code" ] | |
| 61 configs += [ "//build/config/compiler:no_chromium_code" ] | |
| 62 | |
| 63 if (is_win) { | |
| 64 configs -= [ "//build/config/win:unicode" ] | |
| 65 } | |
| 66 | |
| 67 if (is_clang) { | |
| 68 # TODO(andrew): Look into fixing this warning upstream: | |
| 69 # http://code.google.com/p/webrtc/issues/detail?id=760 | |
| 70 configs -= [ "//build/config/clang:extra_warnings" ] | |
| 71 cflags += [ "-Wno-microsoft-include" ] | |
| 72 } | |
| 73 } | |
| OLD | NEW |