| 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("//chrome/common/features.gni") | 9 import("//chrome/common/features.gni") |
| 10 import("//media/media_options.gni") | 10 import("//media/media_options.gni") |
| (...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources, | 581 sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources, |
| 582 ".", | 582 ".", |
| 583 "//chrome") | 583 "//chrome") |
| 584 configs += [ ":gnome_keyring" ] | 584 configs += [ ":gnome_keyring" ] |
| 585 } | 585 } |
| 586 if (is_desktop_linux) { | 586 if (is_desktop_linux) { |
| 587 sources += rebase_path(gypi_values.chrome_browser_libsecret_sources, | 587 sources += rebase_path(gypi_values.chrome_browser_libsecret_sources, |
| 588 ".", | 588 ".", |
| 589 "//chrome") | 589 "//chrome") |
| 590 defines += [ "USE_LIBSECRET" ] | 590 defines += [ "USE_LIBSECRET" ] |
| 591 deps += [ "//third_party/libsecret" ] |
| 591 } | 592 } |
| 592 if (use_aura) { | 593 if (use_aura) { |
| 593 sources += | 594 sources += |
| 594 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome") | 595 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome") |
| 595 | 596 |
| 596 # These files are only built in a GN build because they bring in | 597 # These files are only built in a GN build because they bring in |
| 597 # dependencies that don't build with GYP. | 598 # dependencies that don't build with GYP. |
| 598 sources += [ | 599 sources += [ |
| 599 "ui/ash/launcher/chrome_mash_shelf_controller.cc", | 600 "ui/ash/launcher/chrome_mash_shelf_controller.cc", |
| 600 "ui/ash/launcher/chrome_mash_shelf_controller.h", | 601 "ui/ash/launcher/chrome_mash_shelf_controller.h", |
| (...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1342 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") | 1343 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") |
| 1343 deps = [ | 1344 deps = [ |
| 1344 "//components/google/core/browser", | 1345 "//components/google/core/browser", |
| 1345 "//components/omnibox/browser", | 1346 "//components/omnibox/browser", |
| 1346 "//components/rlz", | 1347 "//components/rlz", |
| 1347 "//components/search_engines", | 1348 "//components/search_engines", |
| 1348 "//rlz:rlz_lib", | 1349 "//rlz:rlz_lib", |
| 1349 ] | 1350 ] |
| 1350 } | 1351 } |
| 1351 } | 1352 } |
| OLD | NEW |