Skip to content

Commit

Permalink
Clean up deprecated sources assignment filter in //device
Browse files Browse the repository at this point in the history 
Remove deprecated_default_sources_assignment_filter and replace
it with explicit is_win, is_mac, etc. sections.

Bug: 1018739
Change-Id: I03160ac3a6ca185583254526647a320aa7173c22
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442833
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813696}
  • Loading branch information
@sdefresne
sdefresne authored and Commit Bot committed Oct 5, 2020
1 parent 5947cec commit 7218807
Show file tree
Hide file tree
Showing 4 changed files with 195 additions and 196 deletions.
92 changes: 54 additions & 38 deletions device/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,23 @@ if (is_mac) {
import("//build/config/mac/mac_sdk.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)

is_linux_without_udev = (is_linux || is_chromeos) && !use_udev

test("device_unittests") {
sources = [
"base/synchronization/one_writer_seqlock_unittest.cc",
"bluetooth/adapter_unittest.cc",
"bluetooth/advertisement_unittest.cc",
"bluetooth/bluetooth_adapter_android_unittest.cc",
"bluetooth/bluetooth_adapter_mac_metrics_unittest.mm",
"bluetooth/bluetooth_adapter_mac_unittest.mm",
"bluetooth/bluetooth_adapter_unittest.cc",
"bluetooth/bluetooth_adapter_win_unittest.cc",
"bluetooth/bluetooth_advertisement_unittest.cc",
"bluetooth/bluetooth_device_unittest.cc",
"bluetooth/bluetooth_device_win_unittest.cc",
"bluetooth/bluetooth_discovery_filter_unittest.cc",
"bluetooth/bluetooth_local_gatt_characteristic_unittest.cc",
"bluetooth/bluetooth_local_gatt_descriptor_unittest.cc",
"bluetooth/bluetooth_local_gatt_service_unittest.cc",
"bluetooth/bluetooth_low_energy_advertisement_manager_mac_unittest.mm",
"bluetooth/bluetooth_low_energy_win_unittest.cc",
"bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc",
"bluetooth/bluetooth_remote_gatt_descriptor_unittest.cc",
"bluetooth/bluetooth_remote_gatt_service_unittest.cc",
"bluetooth/bluetooth_service_record_win_unittest.cc",
"bluetooth/bluetooth_task_manager_win_unittest.cc",
"bluetooth/device_unittest.cc",
"bluetooth/public/cpp/bluetooth_uuid_unittest.cc",
"bluetooth/server_socket_unittest.cc",
Expand All @@ -57,22 +41,6 @@ test("device_unittests") {
"bluetooth/test/bluetooth_gatt_server_test.h",
"bluetooth/test/bluetooth_test.cc",
"bluetooth/test/bluetooth_test.h",
"bluetooth/test/bluetooth_test_android.cc",
"bluetooth/test/bluetooth_test_android.h",
"bluetooth/test/bluetooth_test_mac.h",
"bluetooth/test/bluetooth_test_mac.mm",
"bluetooth/test/bluetooth_test_win.cc",
"bluetooth/test/bluetooth_test_win.h",
"bluetooth/test/mock_bluetooth_cbcharacteristic_mac.h",
"bluetooth/test/mock_bluetooth_cbcharacteristic_mac.mm",
"bluetooth/test/mock_bluetooth_cbdescriptor_mac.h",
"bluetooth/test/mock_bluetooth_cbdescriptor_mac.mm",
"bluetooth/test/mock_bluetooth_cbperipheral_mac.h",
"bluetooth/test/mock_bluetooth_cbperipheral_mac.mm",
"bluetooth/test/mock_bluetooth_cbservice_mac.h",
"bluetooth/test/mock_bluetooth_cbservice_mac.mm",
"bluetooth/test/mock_bluetooth_central_manager_mac.h",
"bluetooth/test/mock_bluetooth_central_manager_mac.mm",
"bluetooth/test/test_bluetooth_adapter_observer.cc",
"bluetooth/test/test_bluetooth_adapter_observer.h",
"bluetooth/test/test_bluetooth_advertisement_observer.cc",
Expand All @@ -93,6 +61,46 @@ test("device_unittests") {
"test/run_all_unittests.cc",
]

if (is_mac) {
sources += [
"bluetooth/bluetooth_adapter_mac_metrics_unittest.mm",
"bluetooth/bluetooth_adapter_mac_unittest.mm",
"bluetooth/bluetooth_low_energy_advertisement_manager_mac_unittest.mm",
"bluetooth/test/bluetooth_test_mac.h",
"bluetooth/test/bluetooth_test_mac.mm",
"bluetooth/test/mock_bluetooth_cbcharacteristic_mac.h",
"bluetooth/test/mock_bluetooth_cbcharacteristic_mac.mm",
"bluetooth/test/mock_bluetooth_cbdescriptor_mac.h",
"bluetooth/test/mock_bluetooth_cbdescriptor_mac.mm",
"bluetooth/test/mock_bluetooth_cbperipheral_mac.h",
"bluetooth/test/mock_bluetooth_cbperipheral_mac.mm",
"bluetooth/test/mock_bluetooth_cbservice_mac.h",
"bluetooth/test/mock_bluetooth_cbservice_mac.mm",
"bluetooth/test/mock_bluetooth_central_manager_mac.h",
"bluetooth/test/mock_bluetooth_central_manager_mac.mm",
]
}

if (is_android) {
sources += [
"bluetooth/bluetooth_adapter_android_unittest.cc",
"bluetooth/test/bluetooth_test_android.cc",
"bluetooth/test/bluetooth_test_android.h",
]
}

if (is_win) {
sources += [
"bluetooth/bluetooth_adapter_win_unittest.cc",
"bluetooth/bluetooth_device_win_unittest.cc",
"bluetooth/bluetooth_low_energy_win_unittest.cc",
"bluetooth/bluetooth_service_record_win_unittest.cc",
"bluetooth/bluetooth_task_manager_win_unittest.cc",
"bluetooth/test/bluetooth_test_win.cc",
"bluetooth/test/bluetooth_test_win.h",
]
}

if (is_fuchsia) {
sources += [
"bluetooth/test/bluetooth_test_fuchsia.cc",
Expand Down Expand Up @@ -161,11 +169,6 @@ test("device_unittests") {
"fido/get_assertion_task_unittest.cc",
"fido/hid/fido_hid_message_unittest.cc",
"fido/large_blob_unittest.cc",
"fido/mac/browsing_data_deletion_unittest.mm",
"fido/mac/credential_metadata_unittest.cc",
"fido/mac/get_assertion_operation_unittest_mac.mm",
"fido/mac/make_credential_operation_unittest_mac.mm",
"fido/mac/util_unittest.cc",
"fido/make_credential_handler_unittest.cc",
"fido/make_credential_task_unittest.cc",
"fido/test_callback_receiver_unittest.cc",
Expand All @@ -174,12 +177,25 @@ test("device_unittests") {
"fido/u2f_sign_operation_unittest.cc",
"fido/virtual_ctap2_device_unittest.cc",
"fido/virtual_u2f_device_unittest.cc",
"fido/win/type_conversions_unittest.cc",
]

deps += [ "//device/fido:mocks" ]
}

if (is_mac) {
sources += [
"fido/mac/browsing_data_deletion_unittest.mm",
"fido/mac/credential_metadata_unittest.cc",
"fido/mac/get_assertion_operation_unittest_mac.mm",
"fido/mac/make_credential_operation_unittest_mac.mm",
"fido/mac/util_unittest.cc",
]
}

if (is_win) {
sources += [ "fido/win/type_conversions_unittest.cc" ]
}

# FIDO HID:
# Android doesn't compile.
# Linux, requires udev.
Expand Down
17 changes: 6 additions & 11 deletions device/base/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,11 @@
import("//build/config/features.gni")
import("//device/vr/buildflags/buildflags.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)

component("base") {
output_name = "device_base"

sources = [
"device_base_export.h",
"device_info_query_win.cc",
"device_info_query_win.h",
"device_monitor_win.cc",
"device_monitor_win.h",
"features.cc",
"features.h",
]
Expand All @@ -42,6 +31,12 @@ component("base") {
}

if (is_win) {
sources += [
"device_info_query_win.cc",
"device_info_query_win.h",
"device_monitor_win.cc",
"device_monitor_win.h",
]
libs = [ "setupapi.lib" ]
}
}
Loading

0 comments on commit 7218807

Please sign in to comment.