Commit b55f2573 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Clean up deprecated sources assignment filter in //components/security_interstitials

Remove deprecated_default_sources_assignment_filter and replace
it with explicit is_win, is_mac, etc. sections.

Bug: 1018739
Change-Id: Ia503bd748f633f2526feafc81c823f6b78132710
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446051Reviewed-by: default avatarAdrienne Porter Felt <felt@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813718}
parent 9662690f
...@@ -4,13 +4,6 @@ ...@@ -4,13 +4,6 @@
import("//components/captive_portal/core/features.gni") import("//components/captive_portal/core/features.gni")
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.gni")
# This file depends on the legacy global sources assignment filter. It should
# be converted to check target platform before assigning source files to the
# sources variable. Remove this import and set_sources_assignment_filter call
# when the file has been converted. See https://crbug.com/1018739 for details.
import("//build/config/deprecated_default_sources_assignment_filter.gni")
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
static_library("security_interstitial_page") { static_library("security_interstitial_page") {
sources = [ sources = [
"bad_clock_blocking_page.cc", "bad_clock_blocking_page.cc",
...@@ -20,9 +13,6 @@ static_library("security_interstitial_page") { ...@@ -20,9 +13,6 @@ static_library("security_interstitial_page") {
"captive_portal_blocking_page.cc", "captive_portal_blocking_page.cc",
"captive_portal_blocking_page.h", "captive_portal_blocking_page.h",
"captive_portal_helper.h", "captive_portal_helper.h",
"captive_portal_helper_android.cc",
"captive_portal_helper_android.h",
"captive_portal_helper_win.cc",
"cert_report_helper.cc", "cert_report_helper.cc",
"cert_report_helper.h", "cert_report_helper.h",
"certificate_error_report.cc", "certificate_error_report.cc",
...@@ -122,7 +112,15 @@ static_library("security_interstitial_page") { ...@@ -122,7 +112,15 @@ static_library("security_interstitial_page") {
deps += [ "//components/wifi" ] deps += [ "//components/wifi" ]
} }
if (is_win) {
sources += [ "captive_portal_helper_win.cc" ]
}
if (is_android) { if (is_android) {
sources += [
"captive_portal_helper_android.cc",
"captive_portal_helper_android.h",
]
deps += deps +=
[ "//components/security_interstitials/content/android:jni_headers" ] [ "//components/security_interstitials/content/android:jni_headers" ]
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment