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

Side by Side Diff: ash/BUILD.gn

Issue 1684823004: Refactors keyboard related code so mash can use a keyboard (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: always compile mojo_shell Created 4 years, 10 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 | « no previous file | ash/DEPS » ('j') | ash/shell.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 8
9 assert(use_aura) 9 assert(use_aura)
10 assert(enable_hidpi) 10 assert(enable_hidpi)
11 11
12 gypi_values = exec_script("//build/gypi_to_gn.py", 12 gypi_values = exec_script("//build/gypi_to_gn.py",
13 [ rebase_path("ash.gyp") ], 13 [ rebase_path("ash.gyp") ],
14 "scope", 14 "scope",
15 [ "ash.gyp" ]) 15 [ "ash.gyp" ])
16 16
17 component("ash") { 17 component("ash") {
18 sources = gypi_values.ash_sources 18 sources = gypi_values.ash_sources
19 sources += [
20 "keyboard/keyboard_ui_mus.cc",
21 "keyboard/keyboard_ui_mus.h",
22 ]
19 23
20 configs += [ "//build/config:precompiled_headers" ] 24 configs += [ "//build/config:precompiled_headers" ]
21 defines = [ "ASH_IMPLEMENTATION" ] 25 defines = [
26 "ASH_IMPLEMENTATION",
27 "MOJO_SHELL_CLIENT",
28 ]
22 29
23 public_deps = [ 30 public_deps = [
24 "//ash/resources", 31 "//ash/resources",
25 "//ash/strings", 32 "//ash/strings",
26 ] 33 ]
27 deps = [ 34 deps = [
28 "//base", 35 "//base",
29 "//base:i18n", 36 "//base:i18n",
30 "//base/third_party/dynamic_annotations", 37 "//base/third_party/dynamic_annotations",
31 "//cc", 38 "//cc",
32 "//components/device_event_log", 39 "//components/device_event_log",
33 "//components/onc", 40 "//components/onc",
34 "//components/signin/core/account_id", 41 "//components/signin/core/account_id",
35 "//components/user_manager", 42 "//components/user_manager",
36 "//components/wallpaper", 43 "//components/wallpaper",
37 "//media", 44 "//media",
45 "//mojo/public/c/system:for_component",
46 "//mojo/shell/public/cpp",
38 "//net", 47 "//net",
39 "//skia", 48 "//skia",
40 "//third_party/icu", 49 "//third_party/icu",
41 "//ui/accessibility", 50 "//ui/accessibility",
42 "//ui/app_list", 51 "//ui/app_list",
43 "//ui/aura", 52 "//ui/aura",
44 "//ui/base", 53 "//ui/base",
45 "//ui/base:ui_data_pack", 54 "//ui/base:ui_data_pack",
46 "//ui/base/ime", 55 "//ui/base/ime",
47 "//ui/compositor", 56 "//ui/compositor",
48 "//ui/events", 57 "//ui/events",
49 "//ui/events:events_base", 58 "//ui/events:events_base",
50 "//ui/events:gesture_detection", 59 "//ui/events:gesture_detection",
51 "//ui/events/devices", 60 "//ui/events/devices",
52 "//ui/gfx", 61 "//ui/gfx",
53 "//ui/gfx/geometry", 62 "//ui/gfx/geometry",
54 "//ui/keyboard", 63 "//ui/keyboard",
64 "//ui/keyboard:mojom",
55 "//ui/message_center", 65 "//ui/message_center",
56 "//ui/platform_window/stub", 66 "//ui/platform_window/stub",
57 "//ui/resources", 67 "//ui/resources",
58 "//ui/strings", 68 "//ui/strings",
59 "//ui/views", 69 "//ui/views",
60 "//ui/wm", 70 "//ui/wm",
61 "//url", 71 "//url",
62 ] 72 ]
63 73
64 if (is_win) { 74 if (is_win) {
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 configs += [ "//build/config/win:windowed" ] 418 configs += [ "//build/config/win:windowed" ]
409 deps += [ "//sandbox" ] 419 deps += [ "//sandbox" ]
410 } 420 }
411 421
412 if (is_chromeos) { 422 if (is_chromeos) {
413 deps += [ "//device/bluetooth" ] 423 deps += [ "//device/bluetooth" ]
414 } 424 }
415 } 425 }
416 # When adding support for isolates, please have a look at run-time dependencies 426 # When adding support for isolates, please have a look at run-time dependencies
417 # in the ash_unittests_run target in ash.gyp. 427 # in the ash_unittests_run target in ash.gyp.
OLDNEW
« no previous file with comments | « no previous file | ash/DEPS » ('j') | ash/shell.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698