| 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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 ] | 418 ] |
| 419 | 419 |
| 420 deps += [ | 420 deps += [ |
| 421 "//ash/resources", | 421 "//ash/resources", |
| 422 "//chromeos", | 422 "//chromeos", |
| 423 ] | 423 ] |
| 424 | 424 |
| 425 if (enable_nacl) { | 425 if (enable_nacl) { |
| 426 deps += [ | 426 deps += [ |
| 427 "//components/nacl:nacl_helper", | 427 "//components/nacl:nacl_helper", |
| 428 # '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi', TODO(GYP) | 428 "//components/nacl:nacl_helper_nonsfi(//build/toolchain/nacl:newlib_pn
acl_nonsfi)", |
| 429 ] | 429 ] |
| 430 } | 430 } |
| 431 | 431 |
| 432 if (is_chrome_branded) { | 432 if (is_chrome_branded) { |
| 433 sources -= [ | 433 sources -= [ |
| 434 # These tests are failing on official cros bots. crbug.com/431450. | 434 # These tests are failing on official cros bots. crbug.com/431450. |
| 435 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", | 435 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", |
| 436 ] | 436 ] |
| 437 } | 437 } |
| 438 } else { | 438 } else { |
| (...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 960 deps += [ | 960 deps += [ |
| 961 #'chrome.gyp:chrome_nacl_win64', TODO(GYP) bug 512869 | 961 #'chrome.gyp:chrome_nacl_win64', TODO(GYP) bug 512869 |
| 962 ] | 962 ] |
| 963 configs -= [ "//build/config/win:default_incremental_linking" ] | 963 configs -= [ "//build/config/win:default_incremental_linking" ] |
| 964 configs += | 964 configs += |
| 965 [ "//build/config/win:default_large_module_incremental_linking" ] | 965 [ "//build/config/win:default_large_module_incremental_linking" ] |
| 966 } | 966 } |
| 967 if (is_linux) { | 967 if (is_linux) { |
| 968 data_deps += [ | 968 data_deps += [ |
| 969 "//components/nacl:nacl_helper", | 969 "//components/nacl:nacl_helper", |
| 970 # "//components/nacl_nonsfi.gyp:nacl_helper_nonsfi", # TODO(GYP) bug
512912. | 970 "//components/nacl:nacl_helper_nonsfi(//build/toolchain/nacl:newlib_pn
acl_nonsfi)", |
| 971 ] | 971 ] |
| 972 } | 972 } |
| 973 } | 973 } |
| 974 if (debug_devtools) { | 974 if (debug_devtools) { |
| 975 defines += [ "DEBUG_DEVTOOLS=1" ] | 975 defines += [ "DEBUG_DEVTOOLS=1" ] |
| 976 } | 976 } |
| 977 if (use_ash) { | 977 if (use_ash) { |
| 978 deps += [ "//ash:test_support" ] | 978 deps += [ "//ash:test_support" ] |
| 979 } | 979 } |
| 980 if (use_aura || toolkit_views) { | 980 if (use_aura || toolkit_views) { |
| (...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2135 "//third_party/mojo/src/mojo/edk/system", | 2135 "//third_party/mojo/src/mojo/edk/system", |
| 2136 ] | 2136 ] |
| 2137 | 2137 |
| 2138 if (!is_android && use_ash) { | 2138 if (!is_android && use_ash) { |
| 2139 sources += rebase_path( | 2139 sources += rebase_path( |
| 2140 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, | 2140 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, |
| 2141 ".", | 2141 ".", |
| 2142 "//chrome") | 2142 "//chrome") |
| 2143 } | 2143 } |
| 2144 } | 2144 } |
| OLD | NEW |