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

Unified Diff: components/proximity_auth/BUILD.gn

Issue 2841743003: [EasyUnlock] Update BluetoothLowEnergyConnectionFinder to look for EIDs. (Closed)
Patch Set: [EasyUnlock] Update BluetoothLowEnergyConnectionFinder to look for EIDs. Created 3 years, 8 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
Index: components/proximity_auth/BUILD.gn
diff --git a/components/proximity_auth/BUILD.gn b/components/proximity_auth/BUILD.gn
index 54800b9cb8016ccbb95316639ad2809ecc93d34c..131a28940b2723e0eddc9ceba25564a1c549eab6 100644
--- a/components/proximity_auth/BUILD.gn
+++ b/components/proximity_auth/BUILD.gn
@@ -10,6 +10,8 @@ static_library("proximity_auth") {
"bluetooth_connection.h",
"bluetooth_connection_finder.cc",
"bluetooth_connection_finder.h",
+ "bluetooth_low_energy_connection_finder.cc",
+ "bluetooth_low_energy_connection_finder.h",
"bluetooth_util.cc",
"bluetooth_util.h",
"bluetooth_util_chromeos.cc",
@@ -52,18 +54,12 @@ static_library("proximity_auth") {
"//components/cryptauth",
"//components/cryptauth/ble",
"//components/prefs",
- "//components/proximity_auth/ble",
"//components/proximity_auth/logging",
"//components/signin/core/account_id:account_id",
"//device/bluetooth",
"//net",
]
- # TODO(https://crbug.com/562683): This whitelists a circular include
- # dependency between this target and the following targets which should not
- # exist.
- allow_circular_includes_from = [ "//components/proximity_auth/ble" ]
-
if (is_chromeos) {
deps += [ "//chromeos" ]
}
@@ -98,6 +94,7 @@ source_set("unit_tests") {
sources = [
"bluetooth_connection_finder_unittest.cc",
"bluetooth_connection_unittest.cc",
+ "bluetooth_low_energy_connection_finder_unittest.cc",
"messenger_impl_unittest.cc",
"proximity_auth_pref_manager_unittest.cc",
"proximity_auth_system_unittest.cc",
@@ -117,8 +114,8 @@ source_set("unit_tests") {
"//base/test:test_support",
"//components/cryptauth:test_support",
"//components/cryptauth:unit_tests",
+ "//components/cryptauth/ble",
"//components/prefs:test_support",
- "//components/proximity_auth/ble:unit_tests",
"//components/proximity_auth/logging",
"//components/proximity_auth/logging:unit_tests",
"//device/bluetooth:mocks",
@@ -133,7 +130,7 @@ source_set("unit_tests") {
# Note: This is a convenience target for ease of rapid iteration during
# development. It is not executed on any try or build bots.
-if (!is_chromeos) {
+if (is_chromeos) {
test("proximity_auth_unittests") {
sources = [
"run_all_unittests.cc",

Powered by Google App Engine
This is Rietveld 408576698