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("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
6 | 6 |
7 if (is_android) { | 7 if (is_android) { |
8 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") |
9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
10 } | 10 } |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 "app/linux/blimp_display_manager.h", | 290 "app/linux/blimp_display_manager.h", |
291 "app/linux/blimp_main.cc", | 291 "app/linux/blimp_main.cc", |
292 ] | 292 ] |
293 | 293 |
294 deps = [ | 294 deps = [ |
295 ":client", | 295 ":client", |
296 "//base", | 296 "//base", |
297 "//blimp/client:compositor", | 297 "//blimp/client:compositor", |
298 "//blimp/net", | 298 "//blimp/net", |
299 "//net", | 299 "//net", |
| 300 "//services/shell/public/cpp", |
300 | 301 |
301 # TODO(khushalsagar|scottmg): Remove this dependency from browser to | 302 # TODO(khushalsagar|scottmg): Remove this dependency from browser to |
302 # blink. See https://crbug.com/608114. | 303 # blink. See https://crbug.com/608114. |
303 "//third_party/WebKit/public:blink", | 304 "//third_party/WebKit/public:blink", |
304 "//ui/events/platform/x11", | 305 "//ui/events/platform/x11", |
305 "//ui/platform_window", | 306 "//ui/platform_window", |
306 "//ui/platform_window/x11", | 307 "//ui/platform_window/x11", |
307 ] | 308 ] |
308 | 309 |
309 public_configs = [ "//build/config/linux:x11" ] | 310 public_configs = [ "//build/config/linux:x11" ] |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
535 instrumentation_test_apk("blimp_test_apk") { | 536 instrumentation_test_apk("blimp_test_apk") { |
536 apk_name = "BlimpTest" | 537 apk_name = "BlimpTest" |
537 apk_under_test = ":blimp_apk" | 538 apk_under_test = ":blimp_apk" |
538 android_manifest = blimp_test_apk_manifest | 539 android_manifest = blimp_test_apk_manifest |
539 android_manifest_dep = ":blimp_test_apk_manifest" | 540 android_manifest_dep = ":blimp_test_apk_manifest" |
540 deps = [ | 541 deps = [ |
541 ":blimp_test_java", | 542 ":blimp_test_java", |
542 ] | 543 ] |
543 } | 544 } |
544 } | 545 } |
OLD | NEW |