Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # CryptAuth is a component which manages data about devices associated with a | 5 # CryptAuth is a component which manages data about devices associated with a |
| 6 # user's account. This component both sends data about the current device and | 6 # user's account. This component both sends data about the current device and |
| 7 # requets data about associated devices. | 7 # requets data about associated devices. |
| 8 | 8 |
| 9 static_library("cryptauth") { | 9 static_library("cryptauth") { |
| 10 sources = [ | 10 sources = [ |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 40 "switches.cc", | 40 "switches.cc", |
| 41 "switches.h", | 41 "switches.h", |
| 42 "sync_scheduler.cc", | 42 "sync_scheduler.cc", |
| 43 "sync_scheduler.h", | 43 "sync_scheduler.h", |
| 44 "sync_scheduler_impl.cc", | 44 "sync_scheduler_impl.cc", |
| 45 "sync_scheduler_impl.h", | 45 "sync_scheduler_impl.h", |
| 46 ] | 46 ] |
| 47 | 47 |
| 48 deps = [ | 48 deps = [ |
| 49 "//base", | 49 "//base", |
| 50 "//components/cryptauth/ble", | |
| 50 "//components/gcm_driver", | 51 "//components/gcm_driver", |
| 51 "//components/gcm_driver/common", | 52 "//components/gcm_driver/common", |
| 52 "//components/prefs", | 53 "//components/prefs", |
| 53 "//components/proximity_auth/logging", | 54 "//components/proximity_auth/logging", |
| 54 "//crypto", | 55 "//crypto", |
| 55 "//google_apis", | 56 "//google_apis", |
| 56 "//net", | 57 "//net", |
| 57 ] | 58 ] |
| 58 | 59 |
| 59 public_deps = [ | 60 public_deps = [ |
| 60 "//components/cryptauth/proto", | 61 "//components/cryptauth/proto", |
| 61 ] | 62 ] |
| 63 | |
| 64 # TODO (hansberry): Resolve this. | |
| 65 allow_circular_includes_from = [ "//components/cryptauth/ble" ] | |
|
Kyle Horimoto
2016/12/08 21:52:40
What is your plan for resolving this and the other
Kyle Horimoto
2016/12/09 01:25:09
Ping.
Ryan Hansberry
2016/12/09 02:36:50
I see two ways to solve this:
1) Consolidate all
Kyle Horimoto
2016/12/09 18:07:46
Cool, those both sound reasonable. No need to do i
Ryan Hansberry
2016/12/09 20:11:05
Great. I'll do that right after this CL.
| |
| 62 } | 66 } |
| 63 | 67 |
| 64 static_library("test_support") { | 68 static_library("test_support") { |
| 65 testonly = true | 69 testonly = true |
| 66 | 70 |
| 67 sources = [ | 71 sources = [ |
| 68 "fake_cryptauth_gcm_manager.cc", | 72 "fake_cryptauth_gcm_manager.cc", |
| 69 "fake_cryptauth_gcm_manager.h", | 73 "fake_cryptauth_gcm_manager.h", |
| 70 "fake_secure_message_delegate.cc", | 74 "fake_secure_message_delegate.cc", |
| 71 "fake_secure_message_delegate.h", | 75 "fake_secure_message_delegate.h", |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 106 ":test_support", | 110 ":test_support", |
| 107 "//base/test:test_support", | 111 "//base/test:test_support", |
| 108 "//components/gcm_driver:test_support", | 112 "//components/gcm_driver:test_support", |
| 109 "//components/prefs:test_support", | 113 "//components/prefs:test_support", |
| 110 "//components/proximity_auth", | 114 "//components/proximity_auth", |
| 111 "//google_apis:test_support", | 115 "//google_apis:test_support", |
| 112 "//net:test_support", | 116 "//net:test_support", |
| 113 "//testing/gtest", | 117 "//testing/gtest", |
| 114 ] | 118 ] |
| 115 } | 119 } |
| OLD | NEW |