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

Side by Side Diff: ash/BUILD.gn

Issue 595073002: Replace forward_dependent_configs with public_deps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | base/allocator/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 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 7
8 gypi_values = exec_script( 8 gypi_values = exec_script(
9 "//build/gypi_to_gn.py", 9 "//build/gypi_to_gn.py",
10 [ rebase_path("ash.gyp") ], 10 [ rebase_path("ash.gyp") ],
11 "scope", 11 "scope",
12 [ "ash.gyp" ]) 12 [ "ash.gyp" ])
13 13
14 component("ash") { 14 component("ash") {
15 sources = gypi_values.ash_sources 15 sources = gypi_values.ash_sources
16 16
17 defines = [ "ASH_IMPLEMENTATION" ] 17 defines = [ "ASH_IMPLEMENTATION" ]
18 18
19 deps = [ 19 public_deps = [
20 "//ash/resources", 20 "//ash/resources",
21 "//ash/strings", 21 "//ash/strings",
22 ]
23 deps = [
22 "//base", 24 "//base",
23 "//base:i18n", 25 "//base:i18n",
24 "//base/third_party/dynamic_annotations", 26 "//base/third_party/dynamic_annotations",
25 "//cc", 27 "//cc",
26 "//components/user_manager", 28 "//components/user_manager",
27 "//content/public/browser", 29 "//content/public/browser",
28 "//media", 30 "//media",
29 "//net", 31 "//net",
30 "//skia", 32 "//skia",
31 "//third_party/icu", 33 "//third_party/icu",
(...skipping 11 matching lines...) Expand all
43 "//ui/message_center", 45 "//ui/message_center",
44 "//ui/resources", 46 "//ui/resources",
45 "//ui/strings", 47 "//ui/strings",
46 "//ui/views", 48 "//ui/views",
47 "//ui/views/controls/webview", 49 "//ui/views/controls/webview",
48 "//ui/web_dialogs", 50 "//ui/web_dialogs",
49 "//ui/wm", 51 "//ui/wm",
50 "//url", 52 "//url",
51 ] 53 ]
52 54
53 forward_dependent_configs_from = [
54 "//ash/resources",
55 "//ash/strings",
56 ]
57
58 if (is_win) { 55 if (is_win) {
59 sources -= [ 56 sources -= [
60 "sticky_keys/sticky_keys_controller.cc", 57 "sticky_keys/sticky_keys_controller.cc",
61 "sticky_keys/sticky_keys_controller.h", 58 "sticky_keys/sticky_keys_controller.h",
62 ] 59 ]
63 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 60 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
64 cflags = [ "/wd4267" ] 61 cflags = [ "/wd4267" ]
65 } 62 }
66 63
67 if (use_x11) { 64 if (use_x11) {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 "screensaver/screensaver_view.cc", 124 "screensaver/screensaver_view.cc",
128 "screensaver/screensaver_view.h", 125 "screensaver/screensaver_view.h",
129 "keyboard_overlay/keyboard_overlay_delegate.cc", 126 "keyboard_overlay/keyboard_overlay_delegate.cc",
130 "keyboard_overlay/keyboard_overlay_delegate.h", 127 "keyboard_overlay/keyboard_overlay_delegate.h",
131 "keyboard_overlay/keyboard_overlay_view.cc", 128 "keyboard_overlay/keyboard_overlay_view.cc",
132 "keyboard_overlay/keyboard_overlay_view.h", 129 "keyboard_overlay/keyboard_overlay_view.h",
133 ] 130 ]
134 131
135 defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ] 132 defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ]
136 133
134 public_deps = [
135 ":ash",
136 ]
137 deps = [ 137 deps = [
138 ":ash",
139 "//base", 138 "//base",
140 "//base/third_party/dynamic_annotations", 139 "//base/third_party/dynamic_annotations",
141 "//content/public/browser", 140 "//content/public/browser",
142 "//ipc", 141 "//ipc",
143 "//skia", 142 "//skia",
144 "//ui/aura", 143 "//ui/aura",
145 "//ui/base", 144 "//ui/base",
146 "//ui/compositor", 145 "//ui/compositor",
147 "//ui/events", 146 "//ui/events",
148 "//ui/gfx", 147 "//ui/gfx",
149 "//ui/gfx/geometry", 148 "//ui/gfx/geometry",
150 "//ui/resources", 149 "//ui/resources",
151 "//ui/strings", 150 "//ui/strings",
152 "//ui/views", 151 "//ui/views",
153 "//ui/views/controls/webview", 152 "//ui/views/controls/webview",
154 "//ui/web_dialogs", 153 "//ui/web_dialogs",
155 "//url", 154 "//url",
156 ] 155 ]
157
158 forward_dependent_configs_from = [
159 ":ash",
160 ]
161 } 156 }
162 157
163 static_library("test_support") { 158 static_library("test_support") {
164 testonly = true 159 testonly = true
165 sources = gypi_values.ash_test_support_sources 160 sources = gypi_values.ash_test_support_sources
166 161
162 public_deps = [
163 ":ash",
164 ]
167 deps = [ 165 deps = [
168 ":ash",
169 "//ash/resources", 166 "//ash/resources",
170 "//content/test:test_support", 167 "//content/test:test_support",
171 "//skia", 168 "//skia",
172 "//testing/gtest", 169 "//testing/gtest",
173 "//ui/accessibility", 170 "//ui/accessibility",
174 "//ui/app_list", 171 "//ui/app_list",
175 "//ui/app_list:test_support", 172 "//ui/app_list:test_support",
176 "//ui/events:events_base", 173 "//ui/events:events_base",
177 "//ui/gl", 174 "//ui/gl",
178 "//ui/views", 175 "//ui/views",
179 "//ui/views:test_support", 176 "//ui/views:test_support",
180 ] 177 ]
181 178
182 forward_dependent_configs_from = [ ":ash" ]
183
184 if (is_win) { 179 if (is_win) {
185 sources += [ 180 sources += [
186 "test/test_metro_viewer_process_host.cc", 181 "test/test_metro_viewer_process_host.cc",
187 "test/test_metro_viewer_process_host.h", 182 "test/test_metro_viewer_process_host.h",
188 ] 183 ]
189 deps += [ 184 deps += [
190 "//ipc", 185 "//ipc",
191 #'../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages', TODO(GYP) 186 #'../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages', TODO(GYP)
192 #'../win8/win8.gyp:metro_viewer', TODO(GYP) 187 #'../win8/win8.gyp:metro_viewer', TODO(GYP)
193 #'../win8/win8.gyp:test_support_win8', TODO(GYP) 188 #'../win8/win8.gyp:test_support_win8', TODO(GYP)
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 "//content/test:test_support", 370 "//content/test:test_support",
376 "//skia", 371 "//skia",
377 "//testing/gtest", 372 "//testing/gtest",
378 "//ui/accessibility", 373 "//ui/accessibility",
379 ] 374 ]
380 375
381 if (is_chromeos) { 376 if (is_chromeos) {
382 deps += [ "//ui/display" ] 377 deps += [ "//ui/display" ]
383 } 378 }
384 } 379 }
OLDNEW
« no previous file with comments | « no previous file | base/allocator/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698