| 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 | 7 |
| 8 # This file deliberately has no default "util" target so dependants have to | 8 # This file deliberately has no default "util" target so dependants have to |
| 9 # specify with the ":with_no_strings" or ":with_rc_strings" variants. Random | 9 # specify with the ":with_no_strings" or ":with_rc_strings" variants. Random |
| 10 # code that ends up getting linked into chrome proper should depend on the | 10 # code that ends up getting linked into chrome proper should depend on the |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 "uninstall_metrics.h", | 94 "uninstall_metrics.h", |
| 95 "user_experiment.cc", | 95 "user_experiment.cc", |
| 96 "user_experiment.h", | 96 "user_experiment.h", |
| 97 ] | 97 ] |
| 98 | 98 |
| 99 deps += [ | 99 deps += [ |
| 100 # Need to depend on the generated strings target since files here | 100 # Need to depend on the generated strings target since files here |
| 101 # depend on the generated header, but only depend on the ":strings" | 101 # depend on the generated header, but only depend on the ":strings" |
| 102 # target (which actually compiles and causes the generated code to be | 102 # target (which actually compiles and causes the generated code to be |
| 103 # linked) from the ":util" target. | 103 # linked) from the ":util" target. |
| 104 ":generate_strings", | 104 #":generate_strings", |
| 105 "//base/third_party/dynamic_annotations", | 105 "//base/third_party/dynamic_annotations", |
| 106 "//chrome/install_static:install_static_util", | 106 "//chrome/install_static:install_static_util", |
| 107 "//components/base32", | 107 "//components/base32", |
| 108 "//components/metrics", | 108 "//components/metrics", |
| 109 "//courgette:courgette_lib", | 109 "//courgette:courgette_lib", |
| 110 "//crypto", | 110 "//crypto", |
| 111 "//third_party/bspatch", | 111 "//third_party/bspatch", |
| 112 "//third_party/crashpad/crashpad/client", | 112 "//third_party/crashpad/crashpad/client", |
| 113 "//third_party/icu", | 113 "//third_party/icu", |
| 114 "//third_party/lzma_sdk", | 114 "//third_party/lzma_sdk", |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 rebase_path(grdfile, root_build_dir) + ":resources", | 264 rebase_path(grdfile, root_build_dir) + ":resources", |
| 265 "-n", | 265 "-n", |
| 266 "installer_util_strings", | 266 "installer_util_strings", |
| 267 "-o", | 267 "-o", |
| 268 rebase_path(target_gen_dir, root_build_dir), | 268 rebase_path(target_gen_dir, root_build_dir), |
| 269 ] | 269 ] |
| 270 } | 270 } |
| 271 | 271 |
| 272 # Compile the generated .rc file. | 272 # Compile the generated .rc file. |
| 273 source_set("strings") { | 273 source_set("strings") { |
| 274 sources = get_target_outputs(":generate_strings") | 274 #sources = get_target_outputs(":generate_strings") |
| 275 public_deps = [ | 275 #public_deps = [ |
| 276 ":generate_strings", | 276 #":generate_strings", |
| 277 ] | 277 #] |
| 278 } | 278 } |
| 279 | 279 |
| 280 if (is_win) { | 280 if (is_win) { |
| 281 test("installer_util_unittests") { | 281 test("installer_util_unittests") { |
| 282 sources = [ | 282 sources = [ |
| 283 "../setup/compat_checks_unittest.cc", | 283 "../setup/compat_checks_unittest.cc", |
| 284 "advanced_firewall_manager_win_unittest.cc", | 284 "advanced_firewall_manager_win_unittest.cc", |
| 285 "beacons_unittest.cc", | 285 "beacons_unittest.cc", |
| 286 "callback_work_item_unittest.cc", | 286 "callback_work_item_unittest.cc", |
| 287 "channel_info_unittest.cc", | 287 "channel_info_unittest.cc", |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 "//testing/gmock", | 344 "//testing/gmock", |
| 345 "//testing/gtest", | 345 "//testing/gtest", |
| 346 ] | 346 ] |
| 347 | 347 |
| 348 data = [ | 348 data = [ |
| 349 "//chrome/test/data/extensions/", | 349 "//chrome/test/data/extensions/", |
| 350 "//chrome/test/data/installer/", | 350 "//chrome/test/data/installer/", |
| 351 ] | 351 ] |
| 352 } | 352 } |
| 353 } # is_win | 353 } # is_win |
| OLD | NEW |