Commit 1d878448 authored by Matt Reynolds's avatar Matt Reynolds Committed by Commit Bot

[hid] Clean up deprecated sources assignment filter

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

BUG=1018739

Change-Id: I1adee96b357e554979214b7d16f50576edcb8152
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2441659Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Commit-Queue: Matt Reynolds <mattreynolds@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812499}
parent 678ee453
......@@ -5,13 +5,6 @@
import("//build/config/features.gni")
import("//testing/libfuzzer/fuzzer_test.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)
source_set("hid") {
# HID is not implemented on Android and we want to be particularly careful
# about not bloating binary size by accidentially including it.
......@@ -22,22 +15,12 @@ source_set("hid") {
"hid_connection.h",
"hid_connection_impl.cc",
"hid_connection_impl.h",
"hid_connection_linux.cc",
"hid_connection_linux.h",
"hid_connection_mac.cc",
"hid_connection_mac.h",
"hid_connection_win.cc",
"hid_connection_win.h",
"hid_device_info.cc",
"hid_device_info.h",
"hid_manager_impl.cc",
"hid_manager_impl.h",
"hid_service.cc",
"hid_service.h",
"hid_service_mac.cc",
"hid_service_mac.h",
"hid_service_win.cc",
"hid_service_win.h",
]
deps = [
......@@ -50,6 +33,8 @@ source_set("hid") {
if ((is_linux || is_chromeos) && use_udev) {
sources += [
"hid_connection_linux.cc",
"hid_connection_linux.h",
"hid_service_linux.cc",
"hid_service_linux.h",
"input_service_linux.cc",
......@@ -63,11 +48,26 @@ source_set("hid") {
}
if (is_win) {
sources += [
"hid_connection_win.cc",
"hid_connection_win.h",
"hid_service_win.cc",
"hid_service_win.h",
]
libs = [
"hid.lib",
"setupapi.lib",
]
}
if (is_mac) {
sources += [
"hid_connection_mac.cc",
"hid_connection_mac.h",
"hid_service_mac.cc",
"hid_service_mac.h",
]
}
}
source_set("mocks") {
......
......@@ -4,21 +4,12 @@
import("//build/config/features.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)
source_set("hid") {
# HID is not implemented on Android and we want to be particularly careful
# about not bloating binary size by accidentially including it.
assert(!is_android)
sources = [
"fake_input_service_linux.cc",
"fake_input_service_linux.h",
"hid_collection.cc",
"hid_collection.h",
"hid_device_filter.cc",
......@@ -39,6 +30,13 @@ source_set("hid") {
"//services/device/public/mojom",
"//services/service_manager/public/cpp",
]
if (is_chromeos) {
sources += [
"fake_input_service_linux.cc",
"fake_input_service_linux.h",
]
}
}
static_library("test_support") {
......
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