Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Side by Side Diff: chrome/test/BUILD.gn

Issue 1951783002: Remove --enable-mac-views-app-list on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gn on not mac Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2138 matching lines...) Expand 10 before | Expand all | Expand 10 after
2149 "//chrome") 2149 "//chrome")
2150 } 2150 }
2151 if (safe_browsing_mode == 1 && enable_extensions) { 2151 if (safe_browsing_mode == 1 && enable_extensions) {
2152 sources += [ "../browser/extensions/blacklist_unittest.cc" ] 2152 sources += [ "../browser/extensions/blacklist_unittest.cc" ]
2153 } 2153 }
2154 if (enable_app_list) { 2154 if (enable_app_list) {
2155 sources += rebase_path( 2155 sources += rebase_path(
2156 chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_sources, 2156 chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_sources,
2157 ".", 2157 ".",
2158 "//chrome") 2158 "//chrome")
2159 if (is_mac) {
2160 # This assumes the AppList is views-based.
msw 2016/05/05 01:51:07 ditto nit: "and Mac uses Cocoa"?
tapted 2016/05/05 02:53:42 Done.
2161 sources -= [ "../browser/ui/app_list/app_list_shower_views_unittest.cc" ]
2162 }
2159 deps += [ "//ui/app_list:test_support" ] 2163 deps += [ "//ui/app_list:test_support" ]
2160 } 2164 }
2161 if (enable_app_list && is_chromeos) { 2165 if (enable_app_list && is_chromeos) {
2162 sources += rebase_path( 2166 sources += rebase_path(
2163 chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_chromeos_so urces, 2167 chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_chromeos_so urces,
2164 ".", 2168 ".",
2165 "//chrome") 2169 "//chrome")
2166 sources += rebase_path( 2170 sources += rebase_path(
2167 chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_chromeos_ar c_sources, 2171 chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_chromeos_ar c_sources,
2168 ".", 2172 ".",
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
2329 if (is_android) { 2333 if (is_android) {
2330 android_library("unit_tests_java") { 2334 android_library("unit_tests_java") {
2331 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 2335 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
2332 deps = [ 2336 deps = [
2333 "//base:base_java", 2337 "//base:base_java",
2334 "//chrome/android:chrome_java", 2338 "//chrome/android:chrome_java",
2335 "//content/public/android:content_java", 2339 "//content/public/android:content_java",
2336 ] 2340 ]
2337 } 2341 }
2338 } 2342 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698