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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 "app/linux/blimp_display_manager.h", | 286 "app/linux/blimp_display_manager.h", |
287 "app/linux/blimp_main.cc", | 287 "app/linux/blimp_main.cc", |
288 ] | 288 ] |
289 | 289 |
290 deps = [ | 290 deps = [ |
291 ":client", | 291 ":client", |
292 "//base", | 292 "//base", |
293 "//blimp/client:compositor", | 293 "//blimp/client:compositor", |
294 "//blimp/net", | 294 "//blimp/net", |
295 "//net", | 295 "//net", |
| 296 "//services/shell/public/cpp", |
296 | 297 |
297 # TODO(khushalsagar|scottmg): Remove this dependency from browser to | 298 # TODO(khushalsagar|scottmg): Remove this dependency from browser to |
298 # blink. See https://crbug.com/608114. | 299 # blink. See https://crbug.com/608114. |
299 "//third_party/WebKit/public:blink", | 300 "//third_party/WebKit/public:blink", |
300 "//ui/events/platform/x11", | 301 "//ui/events/platform/x11", |
301 "//ui/platform_window", | 302 "//ui/platform_window", |
302 "//ui/platform_window/x11", | 303 "//ui/platform_window/x11", |
303 ] | 304 ] |
304 | 305 |
305 public_configs = [ "//build/config/linux:x11" ] | 306 public_configs = [ "//build/config/linux:x11" ] |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
531 instrumentation_test_apk("blimp_test_apk") { | 532 instrumentation_test_apk("blimp_test_apk") { |
532 apk_name = "BlimpTest" | 533 apk_name = "BlimpTest" |
533 apk_under_test = ":blimp_apk" | 534 apk_under_test = ":blimp_apk" |
534 android_manifest = blimp_test_apk_manifest | 535 android_manifest = blimp_test_apk_manifest |
535 android_manifest_dep = ":blimp_test_apk_manifest" | 536 android_manifest_dep = ":blimp_test_apk_manifest" |
536 deps = [ | 537 deps = [ |
537 ":blimp_test_java", | 538 ":blimp_test_java", |
538 ] | 539 ] |
539 } | 540 } |
540 } | 541 } |
OLD | NEW |