| 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("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") |
| (...skipping 3327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3338 "../browser/ui/webui/browsing_history_handler_unittest.cc", | 3338 "../browser/ui/webui/browsing_history_handler_unittest.cc", |
| 3339 "../browser/ui/webui/fileicon_source_unittest.cc", | 3339 "../browser/ui/webui/fileicon_source_unittest.cc", |
| 3340 "../browser/ui/webui/local_state/local_state_ui_unittest.cc", | 3340 "../browser/ui/webui/local_state/local_state_ui_unittest.cc", |
| 3341 "../browser/ui/webui/log_web_ui_url_unittest.cc", | 3341 "../browser/ui/webui/log_web_ui_url_unittest.cc", |
| 3342 "../browser/update_client/chrome_update_query_params_delegate_unittest.cc", | 3342 "../browser/update_client/chrome_update_query_params_delegate_unittest.cc", |
| 3343 "../browser/win/chrome_elf_init_unittest.cc", | 3343 "../browser/win/chrome_elf_init_unittest.cc", |
| 3344 "../browser/win/enumerate_modules_model_unittest.cc", | 3344 "../browser/win/enumerate_modules_model_unittest.cc", |
| 3345 "../common/chrome_content_client_unittest.cc", | 3345 "../common/chrome_content_client_unittest.cc", |
| 3346 "../common/chrome_paths_unittest.cc", | 3346 "../common/chrome_paths_unittest.cc", |
| 3347 "../common/component_flash_hint_file_linux_unittest.cc", | 3347 "../common/component_flash_hint_file_linux_unittest.cc", |
| 3348 "../common/conflicts/module_watcher_win_unittest.cc", |
| 3348 "../common/crash_keys_unittest.cc", | 3349 "../common/crash_keys_unittest.cc", |
| 3349 "../common/ini_parser_unittest.cc", | 3350 "../common/ini_parser_unittest.cc", |
| 3350 "../common/mac/cfbundle_blocker_unittest.mm", | 3351 "../common/mac/cfbundle_blocker_unittest.mm", |
| 3351 "../common/mac/mock_launchd.cc", | 3352 "../common/mac/mock_launchd.cc", |
| 3352 "../common/mac/mock_launchd.h", | 3353 "../common/mac/mock_launchd.h", |
| 3353 "../common/origin_trials/chrome_origin_trial_policy_unittest.cc", | 3354 "../common/origin_trials/chrome_origin_trial_policy_unittest.cc", |
| 3354 "../common/partial_circular_buffer_unittest.cc", | 3355 "../common/partial_circular_buffer_unittest.cc", |
| 3355 "../common/pref_names_util_unittest.cc", | 3356 "../common/pref_names_util_unittest.cc", |
| 3356 "../common/search/instant_types_unittest.cc", | 3357 "../common/search/instant_types_unittest.cc", |
| 3357 "../common/search/search_urls_unittest.cc", | 3358 "../common/search/search_urls_unittest.cc", |
| (...skipping 1348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4706 "//chrome/installer/util:strings", | 4707 "//chrome/installer/util:strings", |
| 4707 "//chrome_elf:blacklist_test_dll_1", | 4708 "//chrome_elf:blacklist_test_dll_1", |
| 4708 "//third_party/iaccessible2", | 4709 "//third_party/iaccessible2", |
| 4709 "//third_party/isimpledom", | 4710 "//third_party/isimpledom", |
| 4710 "//third_party/wtl", | 4711 "//third_party/wtl", |
| 4711 "//ui/resources", | 4712 "//ui/resources", |
| 4712 ] | 4713 ] |
| 4713 data_deps += [ | 4714 data_deps += [ |
| 4714 "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_
test_dll_1", | 4715 "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_
test_dll_1", |
| 4715 "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_
test_dll_2", | 4716 "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_
test_dll_2", |
| 4717 ":conflicts_dll", |
| 4716 ] | 4718 ] |
| 4717 | 4719 |
| 4718 libs = [ | 4720 libs = [ |
| 4719 "comsupp.lib", | 4721 "comsupp.lib", |
| 4720 "oleacc.lib", | 4722 "oleacc.lib", |
| 4721 "rpcrt4.lib", | 4723 "rpcrt4.lib", |
| 4722 "urlmon.lib", | 4724 "urlmon.lib", |
| 4723 "winmm.lib", | 4725 "winmm.lib", |
| 4724 ] | 4726 ] |
| 4725 if (!is_chrome_branded) { | 4727 if (!is_chrome_branded) { |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5105 "touch_hud", | 5107 "touch_hud", |
| 5106 "ui", | 5108 "ui", |
| 5107 ] | 5109 ] |
| 5108 | 5110 |
| 5109 if (is_linux && !is_android) { | 5111 if (is_linux && !is_android) { |
| 5110 deps += [ "//components/font_service:manifest" ] | 5112 deps += [ "//components/font_service:manifest" ] |
| 5111 packaged_services += [ "font_service" ] | 5113 packaged_services += [ "font_service" ] |
| 5112 } | 5114 } |
| 5113 } | 5115 } |
| 5114 } | 5116 } |
| 5117 |
| 5118 if (is_win) { |
| 5119 loadable_module("conflicts_dll") { |
| 5120 testonly = true |
| 5121 sources = [ |
| 5122 "conflicts/conflicts_dll.cc", |
| 5123 ] |
| 5124 } |
| 5125 } |
| OLD | NEW |