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

Unified Diff: net/BUILD.gn

Issue 1291703008: Rename is_chromeos in chrome/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/interfaces/BUILD.gn ('k') | printing/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 823d8698f207d3cfc581bd878edf3bd7fc3fd6f9..5a2ce5d32fd6d210a3379c660b2f49ecbf66c263 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -33,7 +33,7 @@ gypi_values = exec_script("//build/gypi_to_gn.py",
# Disable Kerberos on ChromeOS, Android and iOS, at least for now. It needs
# configuration (krb5.conf and so on).
-use_kerberos = !is_chromeos && !is_android && !is_ios
+use_kerberos = !is_chromeos_ui && !is_android && !is_ios
# The way the cache uses mmap() is inefficient on some Android devices. If
# this flag is set, we hackily avoid using mmap() in the disk cache. We are
@@ -306,7 +306,7 @@ component("net") {
]
}
- if (use_glib && !is_chromeos) {
+ if (use_glib && !is_chromeos_ui) {
configs += [ "//build/config/linux:gconf" ]
deps += [ "//build/config/linux:gio" ]
}
@@ -344,7 +344,7 @@ component("net") {
"cert_net/nss_ocsp.h",
]
}
- if (is_chromeos) {
+ if (is_chromeos_ui) {
# These were already removed on non-ChromeOS.
sources -= [
"cert/nss_cert_database_chromeos.cc",
@@ -1010,7 +1010,7 @@ if (!is_ios && !is_android) {
"//base",
]
- if (is_desktop_linux) {
+ if (is_linux && !is_chromeos_ui) {
configs += [
"//build/config/linux:gconf",
"//build/config/linux:glib",
@@ -1407,7 +1407,7 @@ test("net_unittests") {
sources += gypi_values.net_base_test_mac_ios_sources
}
- if (is_chromeos) {
+ if (is_chromeos_ui) {
sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ]
}
@@ -1420,7 +1420,7 @@ test("net_unittests") {
"cert/nss_cert_database_unittest.cc",
"ssl/client_cert_store_nss_unittest.cc",
]
- if (is_chromeos) { # Already removed for all non-ChromeOS builds.
+ if (is_chromeos_ui) { # Already removed for all non-ChromeOS builds.
sources -= [
"cert/nss_cert_database_chromeos_unittest.cc",
"cert/nss_profile_filter_chromeos_unittest.cc",
@@ -1461,7 +1461,7 @@ test("net_unittests") {
sources -= [ "http/http_auth_handler_negotiate_unittest.cc" ]
}
- if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) {
+ if (use_openssl || (!is_desktop_linux && !is_chromeos_ui && !is_ios)) {
# Only include this test when on Posix and using NSS for
# cert verification or on iOS (which also uses NSS for certs).
sources -= [ "cert_net/nss_ocsp_unittest.cc" ]
« no previous file with comments | « media/mojo/interfaces/BUILD.gn ('k') | printing/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698