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

Side by Side Diff: ash/BUILD.gn

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pure rebase 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/ash.gyp » ('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 import("//testing/test.gni") 7 import("//testing/test.gni")
8 8
9 assert(use_ash) 9 assert(use_ash)
10 10
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 sources = gypi_values.ash_unittests_sources 282 sources = gypi_values.ash_unittests_sources
283 configs += [ "//build/config:precompiled_headers" ] 283 configs += [ "//build/config:precompiled_headers" ]
284 284
285 deps = [ 285 deps = [
286 ":ash", 286 ":ash",
287 ":ash_with_content", 287 ":ash_with_content",
288 ":test_support", 288 ":test_support",
289 "//ash/resources", 289 "//ash/resources",
290 "//ash/strings", 290 "//ash/strings",
291 "//base", 291 "//base",
292 "//base/allocator",
293 "//base/test:test_support", 292 "//base/test:test_support",
294 "//components/signin/core/account_id", 293 "//components/signin/core/account_id",
295 "//components/user_manager", 294 "//components/user_manager",
296 "//content/public/browser", 295 "//content/public/browser",
297 "//content/test:test_support", 296 "//content/test:test_support",
298 "//skia", 297 "//skia",
299 "//testing/gtest", 298 "//testing/gtest",
300 "//third_party/icu", 299 "//third_party/icu",
301 "//ui/accessibility", 300 "//ui/accessibility",
302 "//ui/aura", 301 "//ui/aura",
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 "accelerators/spoken_feedback_toggler_unittest.cc", 370 "accelerators/spoken_feedback_toggler_unittest.cc",
372 "display/resolution_notification_controller_unittest.cc", 371 "display/resolution_notification_controller_unittest.cc",
373 "touch/touchscreen_util_unittest.cc", 372 "touch/touchscreen_util_unittest.cc",
374 ] 373 ]
375 } 374 }
376 375
377 if (!use_x11 || !is_chromeos) { 376 if (!use_x11 || !is_chromeos) {
378 sources -= [ "touch/touch_transformer_controller_unittest.cc" ] 377 sources -= [ "touch/touch_transformer_controller_unittest.cc" ]
379 } 378 }
380 379
381 # TODO(GYP) is this necessary?
382 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
383 # ldflags = "-rdynamic"
384
385 if (!is_chromeos) { 380 if (!is_chromeos) {
386 sources -= [ "sticky_keys/sticky_keys_unittest.cc" ] 381 sources -= [ "sticky_keys/sticky_keys_unittest.cc" ]
387 } 382 }
388 } 383 }
389 384
390 executable("ash_shell_with_content") { 385 executable("ash_shell_with_content") {
391 testonly = true 386 testonly = true
392 sources = [ 387 sources = [
393 "shell/content/shell_with_content_main.cc", 388 "shell/content/shell_with_content_main.cc",
394 ] 389 ]
395 390
396 deps = [ 391 deps = [
397 ":ash_shell_lib_with_content", 392 ":ash_shell_lib_with_content",
398 "//build/config/sanitizers:deps", 393 "//build/config/sanitizers:deps",
399 "//components/user_manager", 394 "//components/user_manager",
400 ] 395 ]
401 396
402 if (is_win) { 397 if (is_win) {
403 configs -= [ "//build/config/win:console" ] 398 configs -= [ "//build/config/win:console" ]
404 configs += [ "//build/config/win:windowed" ] 399 configs += [ "//build/config/win:windowed" ]
405 deps += [ "//sandbox" ] 400 deps += [ "//sandbox" ]
406 } 401 }
407 402
408 if (is_chromeos) { 403 if (is_chromeos) {
409 deps += [ "//device/bluetooth" ] 404 deps += [ "//device/bluetooth" ]
410 } 405 }
411 } 406 }
412 # When adding support for isolates, please have a look at run-time dependencies 407 # When adding support for isolates, please have a look at run-time dependencies
413 # in the ash_unittests_run target in ash.gyp. 408 # in the ash_unittests_run target in ash.gyp.
OLDNEW
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698