Commit 94c4b5f1 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

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

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

Bug: 1018739
Change-Id: I4532b48bf0c141e578e4a81210134862db7e343a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445496Reviewed-by: default avatarDavid Benjamin <davidben@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813662}
parent ea445710
...@@ -2,13 +2,6 @@ ...@@ -2,13 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
# 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)
component("wifi") { component("wifi") {
sources = [ sources = [
"network_properties.cc", "network_properties.cc",
...@@ -16,8 +9,6 @@ component("wifi") { ...@@ -16,8 +9,6 @@ component("wifi") {
"wifi_export.h", "wifi_export.h",
"wifi_service.cc", "wifi_service.cc",
"wifi_service.h", "wifi_service.h",
"wifi_service_mac.mm",
"wifi_service_win.cc",
] ]
defines = [ "WIFI_IMPLEMENTATION" ] defines = [ "WIFI_IMPLEMENTATION" ]
...@@ -29,6 +20,7 @@ component("wifi") { ...@@ -29,6 +20,7 @@ component("wifi") {
] ]
if (is_win) { if (is_win) {
sources += [ "wifi_service_win.cc" ]
libs = [ "iphlpapi.lib" ] libs = [ "iphlpapi.lib" ]
deps += [ deps += [
"//third_party/libxml:xml_reader", # Safe, data come from system. "//third_party/libxml:xml_reader", # Safe, data come from system.
...@@ -37,6 +29,7 @@ component("wifi") { ...@@ -37,6 +29,7 @@ component("wifi") {
} }
if (is_mac) { if (is_mac) {
sources += [ "wifi_service_mac.mm" ]
frameworks = [ frameworks = [
"CoreWLAN.framework", "CoreWLAN.framework",
"Foundation.framework", "Foundation.framework",
......
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