| 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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 "//chrome") | 470 "//chrome") |
| 470 } | 471 } |
| 471 | 472 |
| 472 if (is_win) { | 473 if (is_win) { |
| 473 sources += rebase_path( | 474 sources += rebase_path( |
| 474 chrome_tests_gypi_values.chrome_interactive_ui_test_win_sources, | 475 chrome_tests_gypi_values.chrome_interactive_ui_test_win_sources, |
| 475 ".", | 476 ".", |
| 476 "//chrome") | 477 "//chrome") |
| 477 deps += [ | 478 deps += [ |
| 478 "//chrome:other_version", | 479 "//chrome:other_version", |
| 480 "//chrome/install_static:install_static_util", |
| 479 "//third_party/isimpledom", | 481 "//third_party/isimpledom", |
| 480 "//third_party/wtl", | 482 "//third_party/wtl", |
| 481 "//ui/resources", | 483 "//ui/resources", |
| 482 ] | 484 ] |
| 483 | 485 |
| 484 configs -= [ "//build/config/win:default_incremental_linking" ] | 486 configs -= [ "//build/config/win:default_incremental_linking" ] |
| 485 configs += | 487 configs += |
| 486 [ "//build/config/win:default_large_module_incremental_linking" ] | 488 [ "//build/config/win:default_large_module_incremental_linking" ] |
| 487 | 489 |
| 488 libs = [ "oleacc.lib" ] | 490 libs = [ "oleacc.lib" ] |
| (...skipping 1571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2060 # The PDB gets too large for incremental linking. | 2062 # The PDB gets too large for incremental linking. |
| 2061 configs -= [ "//build/config/win:default_incremental_linking" ] | 2063 configs -= [ "//build/config/win:default_incremental_linking" ] |
| 2062 configs += [ "//build/config/win:no_incremental_linking" ] | 2064 configs += [ "//build/config/win:no_incremental_linking" ] |
| 2063 | 2065 |
| 2064 sources += | 2066 sources += |
| 2065 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_win_sources, | 2067 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_win_sources, |
| 2066 ".", | 2068 ".", |
| 2067 "//chrome") | 2069 "//chrome") |
| 2068 deps += [ | 2070 deps += [ |
| 2069 "//chrome:other_version", | 2071 "//chrome:other_version", |
| 2072 "//chrome/install_static:install_static_util", |
| 2070 "//chrome/installer/util:strings", | 2073 "//chrome/installer/util:strings", |
| 2071 "//chrome_elf:blacklist_test_dll_1", | 2074 "//chrome_elf:blacklist_test_dll_1", |
| 2072 "//third_party/iaccessible2", | 2075 "//third_party/iaccessible2", |
| 2073 "//third_party/isimpledom", | 2076 "//third_party/isimpledom", |
| 2074 "//third_party/wtl", | 2077 "//third_party/wtl", |
| 2075 "//ui/resources", | 2078 "//ui/resources", |
| 2076 ] | 2079 ] |
| 2077 data_deps += [ | 2080 data_deps += [ |
| 2078 "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_
test_dll_1", | 2081 "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_
test_dll_1", |
| 2079 "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_
test_dll_2", | 2082 "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_
test_dll_2", |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2293 if (is_android) { | 2296 if (is_android) { |
| 2294 android_library("unit_tests_java") { | 2297 android_library("unit_tests_java") { |
| 2295 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] | 2298 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] |
| 2296 deps = [ | 2299 deps = [ |
| 2297 "//base:base_java", | 2300 "//base:base_java", |
| 2298 "//chrome/android:chrome_java", | 2301 "//chrome/android:chrome_java", |
| 2299 "//content/public/android:content_java", | 2302 "//content/public/android:content_java", |
| 2300 ] | 2303 ] |
| 2301 } | 2304 } |
| 2302 } | 2305 } |
| OLD | NEW |