| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 "app/linux/blimp_display_manager_delegate_main.h", | 125 "app/linux/blimp_display_manager_delegate_main.h", |
| 126 "app/linux/blimp_main.cc", | 126 "app/linux/blimp_main.cc", |
| 127 ] | 127 ] |
| 128 | 128 |
| 129 deps = [ | 129 deps = [ |
| 130 ":client", | 130 ":client", |
| 131 "//base", | 131 "//base", |
| 132 "//blimp/client/core/compositor", | 132 "//blimp/client/core/compositor", |
| 133 "//blimp/client/core/session", | 133 "//blimp/client/core/session", |
| 134 "//blimp/net", | 134 "//blimp/net", |
| 135 |
| 136 # Not actually used yet, added so that grpc_support will be compiled. |
| 137 "//components/grpc_support", |
| 135 "//net", | 138 "//net", |
| 136 "//services/shell/public/cpp", | 139 "//services/shell/public/cpp", |
| 137 | 140 |
| 138 # TODO(khushalsagar|scottmg): Remove this dependency from browser to | 141 # TODO(khushalsagar|scottmg): Remove this dependency from browser to |
| 139 # blink. See https://crbug.com/608114. | 142 # blink. See https://crbug.com/608114. |
| 140 "//third_party/WebKit/public:blink", | 143 "//third_party/WebKit/public:blink", |
| 141 "//ui/events/platform/x11", | 144 "//ui/events/platform/x11", |
| 142 "//ui/platform_window", | 145 "//ui/platform_window", |
| 143 "//ui/platform_window/x11", | 146 "//ui/platform_window/x11", |
| 144 ] | 147 ] |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 instrumentation_test_apk("blimp_test_apk") { | 373 instrumentation_test_apk("blimp_test_apk") { |
| 371 apk_name = "BlimpTest" | 374 apk_name = "BlimpTest" |
| 372 apk_under_test = ":blimp_apk" | 375 apk_under_test = ":blimp_apk" |
| 373 android_manifest = blimp_test_apk_manifest | 376 android_manifest = blimp_test_apk_manifest |
| 374 android_manifest_dep = ":blimp_test_apk_manifest" | 377 android_manifest_dep = ":blimp_test_apk_manifest" |
| 375 deps = [ | 378 deps = [ |
| 376 ":blimp_test_java", | 379 ":blimp_test_java", |
| 377 ] | 380 ] |
| 378 } | 381 } |
| 379 } | 382 } |
| OLD | NEW |