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 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1103 "//ui/resources", | 1103 "//ui/resources", |
1104 ] | 1104 ] |
1105 } else { | 1105 } else { |
1106 sources -= [ | 1106 sources -= [ |
1107 "../app/chrome_command_ids.h", | 1107 "../app/chrome_command_ids.h", |
1108 "../app/chrome_dll_resource.h", | 1108 "../app/chrome_dll_resource.h", |
1109 "../app/chrome_version.rc.version", | 1109 "../app/chrome_version.rc.version", |
1110 "../browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc ", | 1110 "../browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc ", |
1111 ] | 1111 ] |
1112 } | 1112 } |
1113 if (!is_chromeos && use_ash) { | 1113 if (!is_chromeos && use_aura && use_ash) { |
jam
2015/11/09 16:36:58
you don't need this. use_aura requires use_aura
Sami
2015/11/11 15:47:41
Thanks, removed.
| |
1114 sources -= [ | 1114 sources -= [ |
1115 # On Windows and Linux, we currently don't support enough of the | 1115 # On Windows and Linux, we currently don't support enough of the |
1116 # ash environment to run these unit tests. | 1116 # ash environment to run these unit tests. |
1117 # | 1117 # |
1118 # TODO: enable these on windows and linux. | 1118 # TODO: enable these on windows and linux. |
1119 "../browser/ui/ash/accelerator_commands_browsertest.cc", | 1119 "../browser/ui/ash/accelerator_commands_browsertest.cc", |
1120 "../browser/ui/ash/accelerator_controller_browsertest.cc", | 1120 "../browser/ui/ash/accelerator_controller_browsertest.cc", |
1121 "../browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc", | 1121 "../browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc", |
1122 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", | 1122 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", |
1123 "../browser/ui/ash/shelf_browsertest.cc", | 1123 "../browser/ui/ash/shelf_browsertest.cc", |
(...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2213 | 2213 |
2214 android_library("unit_tests_java") { | 2214 android_library("unit_tests_java") { |
2215 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" | 2215 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" |
2216 deps = [ | 2216 deps = [ |
2217 "//base:base_java", | 2217 "//base:base_java", |
2218 "//chrome/android:chrome_java", | 2218 "//chrome/android:chrome_java", |
2219 "//content/public/android:content_java", | 2219 "//content/public/android:content_java", |
2220 ] | 2220 ] |
2221 } | 2221 } |
2222 } | 2222 } |
OLD | NEW |