| 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 "linux/blimp_display_manager_delegate_main.cc", | 136 "linux/blimp_display_manager_delegate_main.cc", |
| 137 "linux/blimp_display_manager_delegate_main.h", | 137 "linux/blimp_display_manager_delegate_main.h", |
| 138 "linux/blimp_main.cc", | 138 "linux/blimp_main.cc", |
| 139 ] | 139 ] |
| 140 | 140 |
| 141 deps = [ | 141 deps = [ |
| 142 ":app", | 142 ":app", |
| 143 "//base", | 143 "//base", |
| 144 "//blimp/client/core/compositor", | 144 "//blimp/client/core/compositor", |
| 145 "//blimp/client/core/session", | 145 "//blimp/client/core/session", |
| 146 "//blimp/client/core/settings:settings", |
| 146 "//blimp/net", | 147 "//blimp/net", |
| 148 "//components/pref_registry", |
| 149 "//components/prefs", |
| 147 "//net", | 150 "//net", |
| 148 "//services/service_manager/public/cpp", | 151 "//services/service_manager/public/cpp", |
| 149 | 152 |
| 150 # TODO(khushalsagar|scottmg): Remove this dependency from browser to | 153 # TODO(khushalsagar|scottmg): Remove this dependency from browser to |
| 151 # blink. See https://crbug.com/608114. | 154 # blink. See https://crbug.com/608114. |
| 152 "//third_party/WebKit/public:blink", | 155 "//third_party/WebKit/public:blink", |
| 153 "//ui/events/platform/x11", | 156 "//ui/events/platform/x11", |
| 154 "//ui/platform_window", | 157 "//ui/platform_window", |
| 155 "//ui/platform_window/x11", | 158 "//ui/platform_window/x11", |
| 156 ] | 159 ] |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 instrumentation_test_apk("blimp_test_apk") { | 400 instrumentation_test_apk("blimp_test_apk") { |
| 398 apk_name = "BlimpTest" | 401 apk_name = "BlimpTest" |
| 399 apk_under_test = ":blimp_apk" | 402 apk_under_test = ":blimp_apk" |
| 400 android_manifest = blimp_test_apk_manifest | 403 android_manifest = blimp_test_apk_manifest |
| 401 android_manifest_dep = ":blimp_test_apk_manifest" | 404 android_manifest_dep = ":blimp_test_apk_manifest" |
| 402 deps = [ | 405 deps = [ |
| 403 ":blimp_test_java", | 406 ":blimp_test_java", |
| 404 ] | 407 ] |
| 405 } | 408 } |
| 406 } | 409 } |
| OLD | NEW |