| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 config("cld_config") { | 5 config("cld_config") { |
| 6 defines = [ "CLD_WINDOWS" ] | 6 defines = [ "CLD_WINDOWS" ] |
| 7 include_dirs = [ "." ] | 7 include_dirs = [ "." ] |
| 8 } | 8 } |
| 9 | 9 |
| 10 static_library("cld") { | 10 static_library("cld") { |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 "base/type_traits.h", | 84 "base/type_traits.h", |
| 85 "base/template_util.h", | 85 "base/template_util.h", |
| 86 ] | 86 ] |
| 87 | 87 |
| 88 configs -= [ | 88 configs -= [ |
| 89 # We have conflicting versions of some base files. | 89 # We have conflicting versions of some base files. |
| 90 "//build/config/compiler:default_include_dirs", | 90 "//build/config/compiler:default_include_dirs", |
| 91 "//build/config/compiler:chromium_code", | 91 "//build/config/compiler:chromium_code", |
| 92 ] | 92 ] |
| 93 configs += [ "//build/config/compiler:no_chromium_code" ] | 93 configs += [ "//build/config/compiler:no_chromium_code" ] |
| 94 direct_dependent_configs = [ ":cld_config" ] | 94 public_configs = [ ":cld_config" ] |
| 95 | 95 |
| 96 if (is_win) { | 96 if (is_win) { |
| 97 defines = [ "COMPILER_MSVC" ] | 97 defines = [ "COMPILER_MSVC" ] |
| 98 cflags = [ | 98 cflags = [ |
| 99 "/wd4005", # Macro defined twice. | 99 "/wd4005", # Macro defined twice. |
| 100 "/wd4006", # #undef expected an identifier. | 100 "/wd4006", # #undef expected an identifier. |
| 101 "/wd4309", # Truncation of constant value. | 101 "/wd4309", # Truncation of constant value. |
| 102 "/wd4267", # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int | 102 "/wd4267", # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int |
| 103 ] | 103 ] |
| 104 } else { | 104 } else { |
| 105 defines = [ "COMPILER_GCC" ] | 105 defines = [ "COMPILER_GCC" ] |
| 106 } | 106 } |
| 107 | 107 |
| 108 deps = [ | 108 public_deps = [ |
| 109 "//third_party/icu:icuuc", | |
| 110 ] | |
| 111 | |
| 112 forward_dependent_configs_from = [ | |
| 113 "//third_party/icu:icuuc", | 109 "//third_party/icu:icuuc", |
| 114 ] | 110 ] |
| 115 } | 111 } |
| OLD | NEW |