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

Side by Side Diff: chrome/browser/BUILD.gn

Issue 655343002: GN: Move configs for single-use Linux packages close to usage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: is_linux -> is_desktop_linux Created 6 years, 2 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 | « build/config/linux/BUILD.gn ('k') | chrome/browser/ui/libgtk2ui/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/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//components/nacl/nacl_defines.gni") 8 import("//components/nacl/nacl_defines.gni")
9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
10 # produces a conflict for the "grit" template so we have to only include one. 10 # produces a conflict for the "grit" template so we have to only include one.
11 if (is_android) { 11 if (is_android) {
12 import("//build/config/android/rules.gni") 12 import("//build/config/android/rules.gni")
13 } else { 13 } else {
14 import("//tools/grit/grit_rule.gni") 14 import("//tools/grit/grit_rule.gni")
15 } 15 }
16 if (is_desktop_linux) {
17 import("//build/config/linux/pkg_config.gni")
18 }
16 19
17 about_credits_file = "$target_gen_dir/about_credits.html" 20 about_credits_file = "$target_gen_dir/about_credits.html"
18 additional_modules_list_file = 21 additional_modules_list_file =
19 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt" 22 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
20 23
21 gypi_values = exec_script( 24 gypi_values = exec_script(
22 "//build/gypi_to_gn.py", 25 "//build/gypi_to_gn.py",
23 [ rebase_path("../chrome_browser.gypi") ], 26 [ rebase_path("../chrome_browser.gypi") ],
24 "scope", 27 "scope",
25 [ "../chrome_browser.gypi" ]) 28 [ "../chrome_browser.gypi" ])
26 29
30 if (is_desktop_linux) {
31 pkg_config("gnome_keyring") {
32 packages = [ "gnome-keyring-1" ]
33 }
34 }
35
27 static_library("browser") { 36 static_library("browser") {
28 configs += [ 37 configs += [
29 "//build/config/compiler:wexit_time_destructors", 38 "//build/config/compiler:wexit_time_destructors",
30 "//third_party/WebKit/public:debug_devtools", 39 "//third_party/WebKit/public:debug_devtools",
31 ] 40 ]
32 defines = [] 41 defines = []
33 sources = [] 42 sources = []
34 libs = [] 43 libs = []
35 ldflags = [] 44 ldflags = []
36 45
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 "metrics/signin_status_metrics_provider.h", 373 "metrics/signin_status_metrics_provider.h",
365 ] 374 ]
366 } 375 }
367 376
368 if (use_cups) { 377 if (use_cups) {
369 configs += [ "//printing:cups" ] 378 configs += [ "//printing:cups" ]
370 } 379 }
371 if (is_desktop_linux) { 380 if (is_desktop_linux) {
372 sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources, 381 sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources,
373 ".", "//chrome") 382 ".", "//chrome")
374 configs += [ "//build/config/linux:gnome_keyring" ] 383 configs += [ ":gnome_keyring" ]
375 } 384 }
376 if (use_aura) { 385 if (use_aura) {
377 sources += rebase_path(gypi_values.chrome_browser_aura_sources, 386 sources += rebase_path(gypi_values.chrome_browser_aura_sources,
378 ".", "//chrome") 387 ".", "//chrome")
379 deps += [ 388 deps += [
380 "//ui/aura", 389 "//ui/aura",
381 "//ui/compositor", 390 "//ui/compositor",
382 "//ui/keyboard", 391 "//ui/keyboard",
383 ] 392 ]
384 } 393 }
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 ] 941 ]
933 } 942 }
934 943
935 if (enable_wifi_bootstrapping) { 944 if (enable_wifi_bootstrapping) {
936 sources += [ 945 sources += [
937 "local_discovery/wifi/mock_wifi_manager.cc", 946 "local_discovery/wifi/mock_wifi_manager.cc",
938 "local_discovery/wifi/mock_wifi_manager.h", 947 "local_discovery/wifi/mock_wifi_manager.h",
939 ] 948 ]
940 } 949 }
941 } 950 }
OLDNEW
« no previous file with comments | « build/config/linux/BUILD.gn ('k') | chrome/browser/ui/libgtk2ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698