Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Side by Side Diff: blimp/client/app/BUILD.gn

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/touch_hud/mus/touch_hud_application.cc ('k') | blimp/engine/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/net", 146 "//blimp/net",
147 "//net", 147 "//net",
148 "//services/shell/public/cpp", 148 "//services/service_manager/public/cpp",
149 149
150 # TODO(khushalsagar|scottmg): Remove this dependency from browser to 150 # TODO(khushalsagar|scottmg): Remove this dependency from browser to
151 # blink. See https://crbug.com/608114. 151 # blink. See https://crbug.com/608114.
152 "//third_party/WebKit/public:blink", 152 "//third_party/WebKit/public:blink",
153 "//ui/events/platform/x11", 153 "//ui/events/platform/x11",
154 "//ui/platform_window", 154 "//ui/platform_window",
155 "//ui/platform_window/x11", 155 "//ui/platform_window/x11",
156 ] 156 ]
157 157
158 public_configs = [ "//build/config/linux:x11" ] 158 public_configs = [ "//build/config/linux:x11" ]
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 instrumentation_test_apk("blimp_test_apk") { 397 instrumentation_test_apk("blimp_test_apk") {
398 apk_name = "BlimpTest" 398 apk_name = "BlimpTest"
399 apk_under_test = ":blimp_apk" 399 apk_under_test = ":blimp_apk"
400 android_manifest = blimp_test_apk_manifest 400 android_manifest = blimp_test_apk_manifest
401 android_manifest_dep = ":blimp_test_apk_manifest" 401 android_manifest_dep = ":blimp_test_apk_manifest"
402 deps = [ 402 deps = [
403 ":blimp_test_java", 403 ":blimp_test_java",
404 ] 404 ]
405 } 405 }
406 } 406 }
OLDNEW
« no previous file with comments | « ash/touch_hud/mus/touch_hud_application.cc ('k') | blimp/engine/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698