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

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

Issue 1554563002: Put more files under the enable_service_discovery build flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fix merge Created 4 years, 11 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
« no previous file with comments | « chrome/common/extensions/api/schemas.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 sources += 1221 sources +=
1222 [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ] 1222 [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ]
1223 deps += [ "//components/copresence" ] 1223 deps += [ "//components/copresence" ]
1224 } 1224 }
1225 if (enable_app_list) { 1225 if (enable_app_list) {
1226 sources += rebase_path( 1226 sources += rebase_path(
1227 chrome_tests_gypi_values.chrome_browser_tests_app_list_sources, 1227 chrome_tests_gypi_values.chrome_browser_tests_app_list_sources,
1228 ".", 1228 ".",
1229 "//chrome") 1229 "//chrome")
1230 } 1230 }
1231 if (enable_service_discovery) {
1232 sources += rebase_path(
1233 chrome_tests_gypi_values.chrome_browser_tests_service_discovery_so urces,
1234 ".",
1235 "//chrome")
1236 }
1231 if (enable_supervised_users) { 1237 if (enable_supervised_users) {
1232 sources += rebase_path( 1238 sources += rebase_path(
1233 chrome_tests_gypi_values.chrome_browser_tests_supervised_user_sour ces, 1239 chrome_tests_gypi_values.chrome_browser_tests_supervised_user_sour ces,
1234 ".", 1240 ".",
1235 "//chrome") 1241 "//chrome")
1236 } 1242 }
1237 if (enable_pepper_cdms) { 1243 if (enable_pepper_cdms) {
1238 # Runtime dependencies. 1244 # Runtime dependencies.
1239 data_deps += [ 1245 data_deps += [
1240 "//media/cdm/ppapi:clearkeycdmadapter", 1246 "//media/cdm/ppapi:clearkeycdmadapter",
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
1706 "//device/usb:mocks", 1712 "//device/usb:mocks",
1707 "//extensions:extensions_resources", 1713 "//extensions:extensions_resources",
1708 "//extensions/strings", 1714 "//extensions/strings",
1709 ] 1715 ]
1710 if (enable_configuration_policy) { 1716 if (enable_configuration_policy) {
1711 sources += rebase_path( 1717 sources += rebase_path(
1712 chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_policy_ sources, 1718 chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_policy_ sources,
1713 ".", 1719 ".",
1714 "//chrome") 1720 "//chrome")
1715 } 1721 }
1722 if (enable_service_discovery) {
1723 sources += rebase_path(
1724 chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_service _discovery_sources,
1725 ".",
1726 "//chrome")
1727 }
1716 if (!is_chromeos) { 1728 if (!is_chromeos) {
1717 sources += rebase_path( 1729 sources += rebase_path(
1718 chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_non_chr omeos_sources, 1730 chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_non_chr omeos_sources,
1719 ".", 1731 ".",
1720 "//chrome") 1732 "//chrome")
1721 } 1733 }
1722 } 1734 }
1723 if (use_ash) { 1735 if (use_ash) {
1724 sources += 1736 sources +=
1725 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources, 1737 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources,
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
2021 "rpcrt4.lib", 2033 "rpcrt4.lib",
2022 "urlmon.lib", 2034 "urlmon.lib",
2023 "winmm.lib", 2035 "winmm.lib",
2024 ] 2036 ]
2025 if (!is_chrome_branded) { 2037 if (!is_chrome_branded) {
2026 sources -= [ "../browser/google/google_update_win_unittest.cc" ] 2038 sources -= [ "../browser/google/google_update_win_unittest.cc" ]
2027 } 2039 }
2028 } 2040 }
2029 if (is_android || is_ios) { 2041 if (is_android || is_ios) {
2030 sources -= [ 2042 sources -= [
2031 "../browser/devtools/device/cast_device_provider_unittest.cc",
2032 "../browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc", 2043 "../browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc",
2033 "../browser/ui/sync/sync_promo_ui_unittest.cc", 2044 "../browser/ui/sync/sync_promo_ui_unittest.cc",
2034 ] 2045 ]
2035 } 2046 }
2036 if (!is_android && !is_chromeos) { 2047 if (!is_android && !is_chromeos) {
2037 sources += rebase_path( 2048 sources += rebase_path(
2038 chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_or_chrom eos_sources, 2049 chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_or_chrom eos_sources,
2039 ".", 2050 ".",
2040 "//chrome") 2051 "//chrome")
2041 } 2052 }
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
2232 if (is_android) { 2243 if (is_android) {
2233 android_library("unit_tests_java") { 2244 android_library("unit_tests_java") {
2234 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" 2245 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
2235 deps = [ 2246 deps = [
2236 "//base:base_java", 2247 "//base:base_java",
2237 "//chrome/android:chrome_java", 2248 "//chrome/android:chrome_java",
2238 "//content/public/android:content_java", 2249 "//content/public/android:content_java",
2239 ] 2250 ]
2240 } 2251 }
2241 } 2252 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/api/schemas.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698