| 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 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1097 "//ui/resources", | 1097 "//ui/resources", |
| 1098 ] | 1098 ] |
| 1099 } else { | 1099 } else { |
| 1100 sources -= [ | 1100 sources -= [ |
| 1101 "../app/chrome_command_ids.h", | 1101 "../app/chrome_command_ids.h", |
| 1102 "../app/chrome_dll_resource.h", | 1102 "../app/chrome_dll_resource.h", |
| 1103 "../app/chrome_version.rc.version", | 1103 "../app/chrome_version.rc.version", |
| 1104 "../browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc
", | 1104 "../browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc
", |
| 1105 ] | 1105 ] |
| 1106 } | 1106 } |
| 1107 if (!is_chromeos && use_aura) { | 1107 if (!is_chromeos && use_aura && use_ash) { |
| 1108 sources -= [ | 1108 sources -= [ |
| 1109 # On Windows and Linux, we currently don't support enough of the | 1109 # On Windows and Linux, we currently don't support enough of the |
| 1110 # ash environment to run these unit tests. | 1110 # ash environment to run these unit tests. |
| 1111 # | 1111 # |
| 1112 # TODO: enable these on windows and linux. | 1112 # TODO: enable these on windows and linux. |
| 1113 "../browser/ui/ash/accelerator_commands_browsertest.cc", | 1113 "../browser/ui/ash/accelerator_commands_browsertest.cc", |
| 1114 "../browser/ui/ash/accelerator_controller_browsertest.cc", | 1114 "../browser/ui/ash/accelerator_controller_browsertest.cc", |
| 1115 "../browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc", | 1115 "../browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc", |
| 1116 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", | 1116 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", |
| 1117 "../browser/ui/ash/shelf_browsertest.cc", | 1117 "../browser/ui/ash/shelf_browsertest.cc", |
| (...skipping 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2164 "//third_party/mojo/src/mojo/edk/system", | 2164 "//third_party/mojo/src/mojo/edk/system", |
| 2165 ] | 2165 ] |
| 2166 | 2166 |
| 2167 if (!is_android && use_ash) { | 2167 if (!is_android && use_ash) { |
| 2168 sources += rebase_path( | 2168 sources += rebase_path( |
| 2169 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, | 2169 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, |
| 2170 ".", | 2170 ".", |
| 2171 "//chrome") | 2171 "//chrome") |
| 2172 } | 2172 } |
| 2173 } | 2173 } |
| OLD | NEW |