| 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 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
| 6 | 6 |
| 7 gypi_values = exec_script("//build/gypi_to_gn.py", | 7 gypi_values = exec_script("//build/gypi_to_gn.py", |
| 8 [ rebase_path("cld_2.gyp") ], | 8 [ rebase_path("cld_2.gyp") ], |
| 9 "scope", | 9 "scope", |
| 10 [ "cld_2.gyp" ]) | 10 [ "cld_2.gyp" ]) |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 if (cld2_platform_support == "static") { | 76 if (cld2_platform_support == "static") { |
| 77 deps += [ ":cld2_static" ] | 77 deps += [ ":cld2_static" ] |
| 78 } else if (cld2_platform_support == "dynamic") { | 78 } else if (cld2_platform_support == "dynamic") { |
| 79 deps += [ ":cld2_dynamic" ] | 79 deps += [ ":cld2_dynamic" ] |
| 80 } | 80 } |
| 81 } | 81 } |
| 82 | 82 |
| 83 config("cld2_warnings") { | 83 config("cld2_warnings") { |
| 84 if (is_clang) { | 84 if (is_clang) { |
| 85 cflags = [ | 85 cflags = [ |
| 86 # cld_2 has unused private fields. | 86 # cld_2 contains unused private fields. |
| 87 # https://code.google.com/p/cld2/issues/detail?id=37 |
| 87 "-Wno-unused-private-field", | 88 "-Wno-unused-private-field", |
| 88 ] | 89 ] |
| 89 } | 90 } |
| 90 } | 91 } |
| 91 | 92 |
| 92 static_library("cld2_static") { | 93 static_library("cld2_static") { |
| 93 sources = gypi_values.cld2_core_impl_sources | 94 sources = gypi_values.cld2_core_impl_sources |
| 94 include_dirs = [ | 95 include_dirs = [ |
| 95 "src/internal", | 96 "src/internal", |
| 96 "src/public", | 97 "src/public", |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 ":cld2_dynamic", | 147 ":cld2_dynamic", |
| 147 ] | 148 ] |
| 148 | 149 |
| 149 configs -= [ "//build/config/compiler:chromium_code" ] | 150 configs -= [ "//build/config/compiler:chromium_code" ] |
| 150 configs += [ | 151 configs += [ |
| 151 ":cld2_dynamic_mode_config", | 152 ":cld2_dynamic_mode_config", |
| 152 "//build/config/compiler:no_chromium_code", | 153 "//build/config/compiler:no_chromium_code", |
| 153 ] | 154 ] |
| 154 } | 155 } |
| 155 } | 156 } |
| OLD | NEW |