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

Side by Side Diff: ui/base/BUILD.gn

Issue 1306473003: make use of use_glib variable rather than is_linux when adding glib config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 | no next file » | 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/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/config.gni") 9 import("//build/config/android/config.gni")
10 import("//build/config/android/rules.gni") 10 import("//build/config/android/rules.gni")
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 379
380 if (!use_aura || !is_linux) { 380 if (!use_aura || !is_linux) {
381 sources -= [ "resource/resource_bundle_auralinux.cc" ] 381 sources -= [ "resource/resource_bundle_auralinux.cc" ]
382 } 382 }
383 383
384 if (use_aura && is_win) { 384 if (use_aura && is_win) {
385 sources -= [ "dragdrop/drag_utils_aura.cc" ] 385 sources -= [ "dragdrop/drag_utils_aura.cc" ]
386 } 386 }
387 387
388 if (is_linux) { 388 if (is_linux) {
389 configs += [ 389 configs += [ "//build/config/linux:fontconfig" ]
390 "//build/config/linux:fontconfig", 390 }
391 "//build/config/linux:glib", 391
392 ] 392 if (use_glib) {
393 configs += [ "//build/config/linux:glib" ]
393 } 394 }
394 395
395 if ((is_linux && !is_chromeos) || is_chromeos) { 396 if ((is_linux && !is_chromeos) || is_chromeos) {
396 if (!toolkit_views && !use_aura) { 397 if (!toolkit_views && !use_aura) {
397 sources -= [ 398 sources -= [
398 "dragdrop/drag_utils.cc", 399 "dragdrop/drag_utils.cc",
399 "dragdrop/drag_utils.h", 400 "dragdrop/drag_utils.h",
400 ] 401 ]
401 } 402 }
402 } 403 }
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 } 854 }
854 if (is_mac) { 855 if (is_mac) {
855 data += [ "$root_out_dir/ui_unittests Framework.framework/" ] 856 data += [ "$root_out_dir/ui_unittests Framework.framework/" ]
856 857
857 if (is_asan && symbol_level == 0) { 858 if (is_asan && symbol_level == 0) {
858 data += [ "$root_out_dir/ui_base_unittests.dSYM/" ] 859 data += [ "$root_out_dir/ui_base_unittests.dSYM/" ]
859 } 860 }
860 } 861 }
861 } 862 }
862 # TODO(GYP) Mac (ui_base_tests_bundle) 863 # TODO(GYP) Mac (ui_base_tests_bundle)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698