| 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/chrome_tests.gni") | 10 import("//chrome/chrome_tests.gni") |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 ] | 184 ] |
| 185 public_deps += [ | 185 public_deps += [ |
| 186 "//breakpad", | 186 "//breakpad", |
| 187 "//components/crash/content/app", | 187 "//components/crash/content/app", |
| 188 "//third_party/ocmock", | 188 "//third_party/ocmock", |
| 189 ] | 189 ] |
| 190 } | 190 } |
| 191 if (is_win) { | 191 if (is_win) { |
| 192 sources += [ "//chrome/app/chrome_crash_reporter_client_win.cc" ] | 192 sources += [ "//chrome/app/chrome_crash_reporter_client_win.cc" ] |
| 193 public_deps += [ | 193 public_deps += [ |
| 194 "//chrome/install_static:install_static_util", |
| 194 "//components/crash/content/app", | 195 "//components/crash/content/app", |
| 195 "//third_party/wtl", | 196 "//third_party/wtl", |
| 196 ] | 197 ] |
| 197 if (use_aura) { | 198 if (use_aura) { |
| 198 public_deps += [ | 199 public_deps += [ |
| 199 "//win8:test_registrar_constants", | 200 "//win8:test_registrar_constants", |
| 200 "//win8:test_support_win8", | 201 "//win8:test_support_win8", |
| 201 ] | 202 ] |
| 202 } | 203 } |
| 203 } | 204 } |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 470 "//chrome") | 471 "//chrome") |
| 471 } | 472 } |
| 472 | 473 |
| 473 if (is_win) { | 474 if (is_win) { |
| 474 sources += rebase_path( | 475 sources += rebase_path( |
| 475 chrome_tests_gypi_values.chrome_interactive_ui_test_win_sources, | 476 chrome_tests_gypi_values.chrome_interactive_ui_test_win_sources, |
| 476 ".", | 477 ".", |
| 477 "//chrome") | 478 "//chrome") |
| 478 deps += [ | 479 deps += [ |
| 479 "//chrome:other_version", | 480 "//chrome:other_version", |
| 481 "//chrome/install_static:install_static_util", |
| 480 "//third_party/isimpledom", | 482 "//third_party/isimpledom", |
| 481 "//third_party/wtl", | 483 "//third_party/wtl", |
| 482 "//ui/resources", | 484 "//ui/resources", |
| 483 ] | 485 ] |
| 484 | 486 |
| 485 configs -= [ "//build/config/win:default_incremental_linking" ] | 487 configs -= [ "//build/config/win:default_incremental_linking" ] |
| 486 configs += | 488 configs += |
| 487 [ "//build/config/win:default_large_module_incremental_linking" ] | 489 [ "//build/config/win:default_large_module_incremental_linking" ] |
| 488 | 490 |
| 489 libs = [ "oleacc.lib" ] | 491 libs = [ "oleacc.lib" ] |
| (...skipping 1557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2047 # The PDB gets too large for incremental linking. | 2049 # The PDB gets too large for incremental linking. |
| 2048 configs -= [ "//build/config/win:default_incremental_linking" ] | 2050 configs -= [ "//build/config/win:default_incremental_linking" ] |
| 2049 configs += [ "//build/config/win:no_incremental_linking" ] | 2051 configs += [ "//build/config/win:no_incremental_linking" ] |
| 2050 | 2052 |
| 2051 sources += | 2053 sources += |
| 2052 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_win_sources, | 2054 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_win_sources, |
| 2053 ".", | 2055 ".", |
| 2054 "//chrome") | 2056 "//chrome") |
| 2055 deps += [ | 2057 deps += [ |
| 2056 "//chrome:other_version", | 2058 "//chrome:other_version", |
| 2059 "//chrome/install_static:install_static_util", |
| 2057 "//chrome/installer/util:strings", | 2060 "//chrome/installer/util:strings", |
| 2058 "//chrome_elf:blacklist_test_dll_1", | 2061 "//chrome_elf:blacklist_test_dll_1", |
| 2059 "//third_party/iaccessible2", | 2062 "//third_party/iaccessible2", |
| 2060 "//third_party/isimpledom", | 2063 "//third_party/isimpledom", |
| 2061 "//third_party/wtl", | 2064 "//third_party/wtl", |
| 2062 "//ui/resources", | 2065 "//ui/resources", |
| 2063 ] | 2066 ] |
| 2064 data_deps += [ | 2067 data_deps += [ |
| 2065 "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_
test_dll_1", | 2068 "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_
test_dll_1", |
| 2066 "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_
test_dll_2", | 2069 "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_
test_dll_2", |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2266 if (is_android) { | 2269 if (is_android) { |
| 2267 android_library("unit_tests_java") { | 2270 android_library("unit_tests_java") { |
| 2268 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] | 2271 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] |
| 2269 deps = [ | 2272 deps = [ |
| 2270 "//base:base_java", | 2273 "//base:base_java", |
| 2271 "//chrome/android:chrome_java", | 2274 "//chrome/android:chrome_java", |
| 2272 "//content/public/android:content_java", | 2275 "//content/public/android:content_java", |
| 2273 ] | 2276 ] |
| 2274 } | 2277 } |
| 2275 } | 2278 } |
| OLD | NEW |