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

Side by Side Diff: ash/BUILD.gn

Issue 1994993003: Moves resources used by ash/wm/common to ash/wm/common/resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: repack chrome Created 4 years, 7 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/shelf/shelf_widget.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 import("//ui/base/ui_features.gni") 8 import("//ui/base/ui_features.gni")
9 9
10 assert(use_aura) 10 assert(use_aura)
11 assert(enable_hidpi) 11 assert(enable_hidpi)
12 12
13 gypi_values = exec_script("//build/gypi_to_gn.py", 13 gypi_values = exec_script("//build/gypi_to_gn.py",
14 [ rebase_path("ash.gyp") ], 14 [ rebase_path("ash.gyp") ],
15 "scope", 15 "scope",
16 [ "ash.gyp" ]) 16 [ "ash.gyp" ])
17 17
18 component("ash") { 18 component("ash") {
19 sources = gypi_values.ash_sources 19 sources = gypi_values.ash_sources
20 20
21 configs += [ "//build/config:precompiled_headers" ] 21 configs += [ "//build/config:precompiled_headers" ]
22 defines = [ "ASH_IMPLEMENTATION" ] 22 defines = [ "ASH_IMPLEMENTATION" ]
23 23
24 public_deps = [ 24 public_deps = [
25 "//ash/resources", 25 "//ash/resources",
26 "//ash/strings", 26 "//ash/strings",
27 "//ash/wm/common:ash_wm_common", 27 "//ash/wm/common:ash_wm_common",
28 "//ash/wm/common/resources",
28 ] 29 ]
29 deps = [ 30 deps = [
30 "//base", 31 "//base",
31 "//base:i18n", 32 "//base:i18n",
32 "//base/third_party/dynamic_annotations", 33 "//base/third_party/dynamic_annotations",
33 "//cc", 34 "//cc",
34 "//components/device_event_log", 35 "//components/device_event_log",
35 "//components/onc", 36 "//components/onc",
36 "//components/signin/core/account_id", 37 "//components/signin/core/account_id",
37 "//components/user_manager", 38 "//components/user_manager",
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 testonly = true 186 testonly = true
186 sources = gypi_values.ash_test_support_sources 187 sources = gypi_values.ash_test_support_sources
187 configs += [ "//build/config:precompiled_headers" ] 188 configs += [ "//build/config:precompiled_headers" ]
188 189
189 public_deps = [ 190 public_deps = [
190 ":ash", 191 ":ash",
191 ] 192 ]
192 deps = [ 193 deps = [
193 ":test_support_with_content", # TODO(beng): reverse this direction. 194 ":test_support_with_content", # TODO(beng): reverse this direction.
194 "//ash/resources", 195 "//ash/resources",
196 "//ash/wm/common/resources",
195 "//base:i18n", 197 "//base:i18n",
196 "//base/test:test_support", 198 "//base/test:test_support",
197 "//components/signin/core/account_id", 199 "//components/signin/core/account_id",
198 "//components/user_manager:user_manager", 200 "//components/user_manager:user_manager",
199 "//content/public/browser", 201 "//content/public/browser",
200 "//content/test:test_support", 202 "//content/test:test_support",
201 "//device/bluetooth", 203 "//device/bluetooth",
202 "//skia", 204 "//skia",
203 "//testing/gtest", 205 "//testing/gtest",
204 "//ui/accessibility", 206 "//ui/accessibility",
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 static_library("ash_shell_lib") { 277 static_library("ash_shell_lib") {
276 testonly = true 278 testonly = true
277 sources = gypi_values.ash_shell_lib_sources 279 sources = gypi_values.ash_shell_lib_sources
278 280
279 deps = [ 281 deps = [
280 ":ash", 282 ":ash",
281 ":ash_with_content", 283 ":ash_with_content",
282 ":test_support", 284 ":test_support",
283 "//ash/resources", 285 "//ash/resources",
284 "//ash/strings", 286 "//ash/strings",
287 "//ash/wm/common/resources",
285 "//base", 288 "//base",
286 "//base:i18n", 289 "//base:i18n",
287 "//components/user_manager", 290 "//components/user_manager",
288 "//net", 291 "//net",
289 "//skia", 292 "//skia",
290 "//third_party/icu", 293 "//third_party/icu",
291 "//ui/app_list/presenter", 294 "//ui/app_list/presenter",
292 "//ui/aura", 295 "//ui/aura",
293 "//ui/base", 296 "//ui/base",
294 "//ui/base/ime", 297 "//ui/base/ime",
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 sources = gypi_values.ash_unittests_sources 345 sources = gypi_values.ash_unittests_sources
343 configs += [ "//build/config:precompiled_headers" ] 346 configs += [ "//build/config:precompiled_headers" ]
344 347
345 deps = [ 348 deps = [
346 ":ash", 349 ":ash",
347 ":ash_with_content", 350 ":ash_with_content",
348 ":test_support", 351 ":test_support",
349 ":test_support_with_content", 352 ":test_support_with_content",
350 "//ash/resources", 353 "//ash/resources",
351 "//ash/strings", 354 "//ash/strings",
355 "//ash/wm/common/resources",
352 "//base", 356 "//base",
353 "//base/test:test_support", 357 "//base/test:test_support",
354 "//components/signin/core/account_id", 358 "//components/signin/core/account_id",
355 "//components/user_manager", 359 "//components/user_manager",
356 "//content/public/browser", 360 "//content/public/browser",
357 "//content/test:test_support", 361 "//content/test:test_support",
358 "//skia", 362 "//skia",
359 "//testing/gtest", 363 "//testing/gtest",
360 "//third_party/icu", 364 "//third_party/icu",
361 "//ui/accessibility", 365 "//ui/accessibility",
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 configs += [ "//build/config/win:windowed" ] 483 configs += [ "//build/config/win:windowed" ]
480 deps += [ "//sandbox" ] 484 deps += [ "//sandbox" ]
481 } 485 }
482 486
483 if (is_chromeos) { 487 if (is_chromeos) {
484 deps += [ "//device/bluetooth" ] 488 deps += [ "//device/bluetooth" ]
485 } 489 }
486 } 490 }
487 # When adding support for isolates, please have a look at run-time dependencies 491 # When adding support for isolates, please have a look at run-time dependencies
488 # in the ash_unittests_run target in ash.gyp. 492 # in the ash_unittests_run target in ash.gyp.
OLDNEW
« no previous file with comments | « no previous file | ash/DEPS » ('j') | ash/shelf/shelf_widget.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698