Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 import("//mojo/public/tools/bindings/mojom.gni") | 5 import("//mojo/public/tools/bindings/mojom.gni") |
| 6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 | 7 |
| 8 static_library("arc") { | 8 static_library("arc") { |
| 9 sources = [ | 9 sources = [ |
| 10 "arc_bridge_host_impl.cc", | 10 "arc_bridge_host_impl.cc", |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 112 deps = [ | 112 deps = [ |
| 113 "//base", | 113 "//base", |
| 114 "//chromeos", | 114 "//chromeos", |
| 115 ] | 115 ] |
| 116 | 116 |
| 117 public_deps = [ | 117 public_deps = [ |
| 118 ":arc_bindings", | 118 ":arc_bindings", |
| 119 ] | 119 ] |
| 120 } | 120 } |
| 121 | 121 |
| 122 # TODO(crbug.com/662510): Remove this altogether. | |
| 123 mojom("arc_bindings_old_types") { | |
| 124 sources = [ | |
| 125 "common/net.mojom", | |
| 126 ] | |
| 127 | |
| 128 public_deps = [ | |
| 129 "//mojo/common:common_custom_types", | |
| 130 "//ui/gfx/geometry/mojo", | |
|
Yusuke Sato
2016/12/14 05:19:08
You probably have to move this line to arc_binding
abhishekbh
2016/12/14 23:07:47
Done.
| |
| 131 ] | |
| 132 | |
| 133 use_new_wrapper_types = false | |
| 134 } | |
| 135 | |
| 136 mojom("arc_bindings") { | 122 mojom("arc_bindings") { |
| 137 sources = [ | 123 sources = [ |
| 138 "common/app.mojom", | 124 "common/app.mojom", |
| 139 "common/arc_bridge.mojom", | 125 "common/arc_bridge.mojom", |
| 140 "common/audio.mojom", | 126 "common/audio.mojom", |
| 141 "common/auth.mojom", | 127 "common/auth.mojom", |
| 142 "common/bitmap.mojom", | 128 "common/bitmap.mojom", |
| 143 "common/bluetooth.mojom", | 129 "common/bluetooth.mojom", |
| 144 "common/boot_phase_monitor.mojom", | 130 "common/boot_phase_monitor.mojom", |
| 145 "common/clipboard.mojom", | 131 "common/clipboard.mojom", |
| 146 "common/crash_collector.mojom", | 132 "common/crash_collector.mojom", |
| 147 "common/enterprise_reporting.mojom", | 133 "common/enterprise_reporting.mojom", |
| 148 "common/file_system.mojom", | 134 "common/file_system.mojom", |
| 149 "common/ime.mojom", | 135 "common/ime.mojom", |
| 150 "common/intent_helper.mojom", | 136 "common/intent_helper.mojom", |
| 151 "common/kiosk.mojom", | 137 "common/kiosk.mojom", |
| 152 "common/metrics.mojom", | 138 "common/metrics.mojom", |
| 139 "common/net.mojom", | |
| 153 "common/notifications.mojom", | 140 "common/notifications.mojom", |
| 154 "common/obb_mounter.mojom", | 141 "common/obb_mounter.mojom", |
| 155 "common/policy.mojom", | 142 "common/policy.mojom", |
| 156 "common/power.mojom", | 143 "common/power.mojom", |
| 157 "common/print.mojom", | 144 "common/print.mojom", |
| 158 "common/process.mojom", | 145 "common/process.mojom", |
| 159 "common/scale_factor.mojom", | 146 "common/scale_factor.mojom", |
| 160 "common/screen_rect.mojom", | 147 "common/screen_rect.mojom", |
| 161 "common/storage_manager.mojom", | 148 "common/storage_manager.mojom", |
| 162 "common/tts.mojom", | 149 "common/tts.mojom", |
| 163 "common/video.mojom", | 150 "common/video.mojom", |
| 164 "common/video_accelerator.mojom", | 151 "common/video_accelerator.mojom", |
| 165 "common/wallpaper.mojom", | 152 "common/wallpaper.mojom", |
| 166 ] | 153 ] |
| 167 | 154 |
| 168 public_deps = [ | 155 public_deps = [ |
| 169 ":arc_bindings_old_types", | |
| 170 "//mojo/common:common_custom_types", | 156 "//mojo/common:common_custom_types", |
| 171 ] | 157 ] |
| 172 } | 158 } |
| 173 | 159 |
| 174 static_library("arc_test_support") { | 160 static_library("arc_test_support") { |
| 175 testonly = true | 161 testonly = true |
| 176 sources = [ | 162 sources = [ |
| 177 "test/fake_app_instance.cc", | 163 "test/fake_app_instance.cc", |
| 178 "test/fake_app_instance.h", | 164 "test/fake_app_instance.h", |
| 179 "test/fake_arc_bridge_service.cc", | 165 "test/fake_arc_bridge_service.cc", |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 228 "//testing/gtest", | 214 "//testing/gtest", |
| 229 "//ui/aura", | 215 "//ui/aura", |
| 230 "//ui/aura:test_support", | 216 "//ui/aura:test_support", |
| 231 "//ui/base:test_support", | 217 "//ui/base:test_support", |
| 232 "//ui/base/ime", | 218 "//ui/base/ime", |
| 233 "//ui/events", | 219 "//ui/events", |
| 234 "//ui/events:dom_keycode_converter", | 220 "//ui/events:dom_keycode_converter", |
| 235 "//url:url", | 221 "//url:url", |
| 236 ] | 222 ] |
| 237 } | 223 } |
| OLD | NEW |