 Chromium Code Reviews
 Chromium Code Reviews Issue 1148173002:
  Remove dependency on resources from installer_util  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 1148173002:
  Remove dependency on resources from installer_util  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| 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 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") | 6 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") | 
| 7 | 7 | 
| 8 gypi_values = exec_script("//build/gypi_to_gn.py", | 8 gypi_values = exec_script("//build/gypi_to_gn.py", | 
| 9 [ rebase_path("../chrome_common.gypi") ], | 9 [ rebase_path("../chrome_common.gypi") ], | 
| 10 "scope", | 10 "scope", | 
| (...skipping 24 matching lines...) Expand all Loading... | |
| 35 } | 35 } | 
| 36 } | 36 } | 
| 37 | 37 | 
| 38 # GYP version: chrome/chrome_common.gyp:common | 38 # GYP version: chrome/chrome_common.gyp:common | 
| 39 static_library("common") { | 39 static_library("common") { | 
| 40 sources = rebase_path(gypi_values.chrome_common_sources, ".", "//chrome") | 40 sources = rebase_path(gypi_values.chrome_common_sources, ".", "//chrome") | 
| 41 defines = [] | 41 defines = [] | 
| 42 | 42 | 
| 43 configs += [ "//build/config/compiler:wexit_time_destructors" ] | 43 configs += [ "//build/config/compiler:wexit_time_destructors" ] | 
| 44 | 44 | 
| 45 public_deps = [ | |
| 46 "//chrome/common:constants", | |
| 47 "//chrome/common/net", | |
| 48 "//chrome/common/safe_browsing:proto", | |
| 49 ] | |
| 
cpu_(ooo_6.6-7.5)
2015/05/20 23:33:50
did you mean to change this in this CL?
 
brettw
2015/05/21 04:38:10
Yes, this is necessary for the "gn check" to pass
 | |
| 45 deps = [ | 50 deps = [ | 
| 46 ":version", | 51 ":version", | 
| 47 "//base:base", | 52 "//base:base", | 
| 48 "//base:i18n", | 53 "//base:i18n", | 
| 49 "//base:prefs", | 54 "//base:prefs", | 
| 50 "//base:base_static", | 55 "//base:base_static", | 
| 51 "//chrome:resources", | 56 "//chrome:resources", | 
| 52 "//chrome:strings", | 57 "//chrome:strings", | 
| 53 "//chrome/app/theme:theme_resources", | 58 "//chrome/app/theme:theme_resources", | 
| 54 "//chrome/common:constants", | |
| 55 "//chrome/common/net", | |
| 56 "//chrome/common/safe_browsing:proto", | |
| 57 "//chrome/installer/util", | 59 "//chrome/installer/util", | 
| 58 "//components/cloud_devices/common", | 60 "//components/cloud_devices/common", | 
| 59 "//components/component_updater", | 61 "//components/component_updater", | 
| 60 "//components/content_settings/core/common", | 62 "//components/content_settings/core/common", | 
| 61 "//components/favicon_base", | 63 "//components/favicon_base", | 
| 62 "//components/json_schema", | 64 "//components/json_schema", | 
| 63 "//components/metrics", | 65 "//components/metrics", | 
| 64 "//components/policy:policy_component_common", | 66 "//components/policy:policy_component_common", | 
| 65 "//components/translate/core/common", | 67 "//components/translate/core/common", | 
| 66 "//components/variations", | 68 "//components/variations", | 
| (...skipping 23 matching lines...) Expand all Loading... | |
| 90 "//components/autofill/content/common", | 92 "//components/autofill/content/common", | 
| 91 "//components/autofill/core/common", | 93 "//components/autofill/core/common", | 
| 92 "//components/password_manager/content/common", | 94 "//components/password_manager/content/common", | 
| 93 "//components/password_manager/core/common", | 95 "//components/password_manager/core/common", | 
| 94 "//components/signin/core/common", | 96 "//components/signin/core/common", | 
| 95 "//components/translate/content/common", | 97 "//components/translate/content/common", | 
| 96 "//ipc", | 98 "//ipc", | 
| 97 "//third_party/re2", | 99 "//third_party/re2", | 
| 98 "//third_party/widevine/cdm:version_h", | 100 "//third_party/widevine/cdm:version_h", | 
| 99 ] | 101 ] | 
| 100 public_deps = [ | 102 public_deps += [ "//third_party/mojo/src/mojo/public/cpp/bindings" ] | 
| 101 "//third_party/mojo/src/mojo/public/cpp/bindings", | |
| 102 ] | |
| 103 } | 103 } | 
| 104 | 104 | 
| 105 if (enable_extensions) { | 105 if (enable_extensions) { | 
| 106 sources += rebase_path(gypi_values.chrome_common_extensions_sources, | 106 sources += rebase_path(gypi_values.chrome_common_extensions_sources, | 
| 107 ".", | 107 ".", | 
| 108 "//chrome") | 108 "//chrome") | 
| 109 deps += [ | 109 deps += [ | 
| 110 "//device/usb", | 110 "//device/usb", | 
| 111 "//chrome/common/extensions/api", | 111 "//chrome/common/extensions/api", | 
| 112 "//extensions/common", | 112 "//extensions/common", | 
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 240 deps += [ "//components/policy" ] | 240 deps += [ "//components/policy" ] | 
| 241 } | 241 } | 
| 242 | 242 | 
| 243 if (safe_browsing_mode == 1) { | 243 if (safe_browsing_mode == 1) { | 
| 244 sources += rebase_path(gypi_values.chrome_common_full_safe_browsing_sources, | 244 sources += rebase_path(gypi_values.chrome_common_full_safe_browsing_sources, | 
| 245 ".", | 245 ".", | 
| 246 "//chrome") | 246 "//chrome") | 
| 247 } | 247 } | 
| 248 } | 248 } | 
| 249 | 249 | 
| 250 # This target allows other targets to depend on result_codes.h which is a | |
| 251 # header-only dependency, without bringing in all of content. | |
| 252 source_set("result_codes") { | |
| 253 sources = [ | |
| 254 "chrome_result_codes.h", | |
| 255 ] | |
| 256 } | |
| 257 | |
| 250 import("//chrome/version.gni") | 258 import("//chrome/version.gni") | 
| 251 process_version("version") { | 259 process_version("version") { | 
| 252 visibility = [ ":common" ] | 260 visibility = [ ":common" ] | 
| 253 template_file = "chrome_version_info_values.h.version" | 261 template_file = "chrome_version_info_values.h.version" | 
| 254 output = "$target_gen_dir/chrome_version_info_values.h" | 262 output = "$target_gen_dir/chrome_version_info_values.h" | 
| 255 } | 263 } | 
| 256 | 264 | 
| 257 process_version("make_chrome_version") { | 265 process_version("make_chrome_version") { | 
| 258 template_file = "chrome_version.cc.version" | 266 template_file = "chrome_version.cc.version" | 
| 259 output = "$target_gen_dir/chrome_version.cc" | 267 output = "$target_gen_dir/chrome_version.cc" | 
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 344 ":constants", | 352 ":constants", | 
| 345 "//base", | 353 "//base", | 
| 346 ] | 354 ] | 
| 347 } | 355 } | 
| 348 | 356 | 
| 349 mojom("mojo_bindings") { | 357 mojom("mojo_bindings") { | 
| 350 sources = [ | 358 sources = [ | 
| 351 "resource_usage_reporter.mojom", | 359 "resource_usage_reporter.mojom", | 
| 352 ] | 360 ] | 
| 353 } | 361 } | 
| OLD | NEW |