| 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("//tools/grit/grit_rule.gni") | 5 import("//tools/grit/grit_rule.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("../chrome_common.gypi") ], | 8 [ rebase_path("../chrome_common.gypi") ], |
| 9 "scope", | 9 "scope", |
| 10 [ "../chrome_common.gypi" ]) | 10 [ "../chrome_common.gypi" ]) |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 ".", | 131 ".", |
| 132 "//chrome") | 132 "//chrome") |
| 133 } | 133 } |
| 134 } | 134 } |
| 135 if (is_mac) { | 135 if (is_mac) { |
| 136 sources += | 136 sources += |
| 137 rebase_path(gypi_values.chrome_common_mac_sources, ".", "//chrome") | 137 rebase_path(gypi_values.chrome_common_mac_sources, ".", "//chrome") |
| 138 } | 138 } |
| 139 | 139 |
| 140 if (enable_nacl) { | 140 if (enable_nacl) { |
| 141 deps += [ | 141 deps += [ "//components/nacl:nacl_common" ] |
| 142 #'<(DEPTH)/components/nacl.gyp:nacl_common', TODO(GYP) | |
| 143 ] | |
| 144 } | 142 } |
| 145 | 143 |
| 146 # Printing. | 144 # Printing. |
| 147 if (enable_basic_printing || enable_print_preview) { | 145 if (enable_basic_printing || enable_print_preview) { |
| 148 deps += [ | 146 deps += [ |
| 149 "//components/printing/common:printing_common", | 147 "//components/printing/common:printing_common", |
| 150 "//printing", | 148 "//printing", |
| 151 ] | 149 ] |
| 152 if (enable_print_preview) { | 150 if (enable_print_preview) { |
| 153 # Full printing support. | 151 # Full printing support. |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 | 278 |
| 281 deps = [ | 279 deps = [ |
| 282 ":make_chrome_version", | 280 ":make_chrome_version", |
| 283 "//base", | 281 "//base", |
| 284 "//base/third_party/dynamic_annotations", | 282 "//base/third_party/dynamic_annotations", |
| 285 "//components/bookmarks/common", | 283 "//components/bookmarks/common", |
| 286 "//third_party/widevine/cdm:version_h", | 284 "//third_party/widevine/cdm:version_h", |
| 287 ] | 285 ] |
| 288 | 286 |
| 289 if (enable_nacl) { | 287 if (enable_nacl) { |
| 290 deps += [ | 288 deps += [ "//components/nacl:nacl_switches" ] |
| 291 #'../components/nacl.gyp:nacl_switches', TODO(GYP) | |
| 292 ] | |
| 293 } | 289 } |
| 294 } | 290 } |
| 295 | 291 |
| 296 source_set("test_support") { | 292 source_set("test_support") { |
| 297 testonly = true | 293 testonly = true |
| 298 visibility = [ "//chrome/test:test_support" ] | 294 visibility = [ "//chrome/test:test_support" ] |
| 299 | 295 |
| 300 sources = [] | 296 sources = [] |
| 301 | 297 |
| 302 deps = [ | 298 deps = [ |
| (...skipping 13 matching lines...) Expand all Loading... |
| 316 | 312 |
| 317 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 313 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
| 318 | 314 |
| 319 if (enable_extensions) { | 315 if (enable_extensions) { |
| 320 sources += [ | 316 sources += [ |
| 321 "extensions/extension_test_util.cc", | 317 "extensions/extension_test_util.cc", |
| 322 "extensions/extension_test_util.h", | 318 "extensions/extension_test_util.h", |
| 323 ] | 319 ] |
| 324 } | 320 } |
| 325 } | 321 } |
| OLD | NEW |