| OLD | NEW |
| 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/crypto.gni") | 6 import("//build/config/crypto.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//build/split_static_library.gni") | 9 import("//build/split_static_library.gni") |
| 10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") |
| 11 import("//components/os_crypt/features.gni") |
| 11 import("//media/media_options.gni") | 12 import("//media/media_options.gni") |
| 12 import("//third_party/protobuf/proto_library.gni") | 13 import("//third_party/protobuf/proto_library.gni") |
| 13 | 14 |
| 14 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which | 15 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which |
| 15 # produces a conflict for the "grit" template so we have to only include one. | 16 # produces a conflict for the "grit" template so we have to only include one. |
| 16 if (is_android) { | 17 if (is_android) { |
| 17 import("//build/config/android/rules.gni") | 18 import("//build/config/android/rules.gni") |
| 18 } else { | 19 } else { |
| 19 import("//tools/grit/grit_rule.gni") | 20 import("//tools/grit/grit_rule.gni") |
| 20 } | 21 } |
| (...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 ] | 563 ] |
| 563 public_deps += [ | 564 public_deps += [ |
| 564 "//components/metrics/leak_detector:interfaces", | 565 "//components/metrics/leak_detector:interfaces", |
| 565 "//components/metrics/leak_detector:leak_detector", | 566 "//components/metrics/leak_detector:leak_detector", |
| 566 ] | 567 ] |
| 567 } | 568 } |
| 568 | 569 |
| 569 if (use_cups) { | 570 if (use_cups) { |
| 570 configs += [ "//printing:cups" ] | 571 configs += [ "//printing:cups" ] |
| 571 } | 572 } |
| 572 if (is_desktop_linux) { | 573 if (use_gnome_keyring) { |
| 573 sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources, | 574 sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources, |
| 574 ".", | 575 ".", |
| 575 "//chrome") | 576 "//chrome") |
| 576 configs += [ "//components/os_crypt:gnome_keyring" ] | 577 configs += [ "//components/os_crypt:gnome_keyring" ] |
| 577 } | 578 } |
| 578 if (is_desktop_linux) { | 579 if (is_desktop_linux) { |
| 579 sources += rebase_path(gypi_values.chrome_browser_libsecret_sources, | 580 sources += rebase_path(gypi_values.chrome_browser_libsecret_sources, |
| 580 ".", | 581 ".", |
| 581 "//chrome") | 582 "//chrome") |
| 582 defines += [ "USE_LIBSECRET" ] | 583 defines += [ "USE_LIBSECRET" ] |
| (...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1354 # linking all of the test support. | 1355 # linking all of the test support. |
| 1355 static_library("pepper_cdm_test_constants") { | 1356 static_library("pepper_cdm_test_constants") { |
| 1356 testonly = true | 1357 testonly = true |
| 1357 visibility = [ "//chrome/*" ] | 1358 visibility = [ "//chrome/*" ] |
| 1358 sources = [ | 1359 sources = [ |
| 1359 "media/pepper_cdm_test_constants.cc", | 1360 "media/pepper_cdm_test_constants.cc", |
| 1360 "media/pepper_cdm_test_constants.h", | 1361 "media/pepper_cdm_test_constants.h", |
| 1361 ] | 1362 ] |
| 1362 } | 1363 } |
| 1363 } | 1364 } |
| OLD | NEW |