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

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

Issue 854503004: Fix some files in chrome directory for Windows GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | chrome/browser/metro_utils/BUILD.gn » ('j') | chrome/test/BUILD.gn » ('J')
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 9
10 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 10 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 } 478 }
479 479
480 if (use_ash) { 480 if (use_ash) {
481 sources += 481 sources +=
482 rebase_path(gypi_values.chrome_browser_ash_sources, ".", "//chrome") 482 rebase_path(gypi_values.chrome_browser_ash_sources, ".", "//chrome")
483 } 483 }
484 484
485 if (use_x11) { 485 if (use_x11) {
486 sources += 486 sources +=
487 rebase_path(gypi_values.chrome_browser_x11_sources, ".", "//chrome") 487 rebase_path(gypi_values.chrome_browser_x11_sources, ".", "//chrome")
488 } else {
489 # In GYP that excluded by filename_rules.gypi, but GN analog -
490 # sources_assignment_filter lacks of that filter, and comments there forbids
491 # adding new rules to it.
Dirk Pranke 2015/01/20 22:56:36 I would probably omit this comment.
492 sources -= [ "password_manager/password_store_x.cc" ]
488 } 493 }
489 if (is_posix && !is_mac && !is_ios) { 494 if (is_posix && !is_mac && !is_ios) {
490 sources += [ 495 sources += [
491 "//chrome/app/chrome_crash_reporter_client.cc", 496 "//chrome/app/chrome_crash_reporter_client.cc",
492 "//chrome/app/chrome_crash_reporter_client.h", 497 "//chrome/app/chrome_crash_reporter_client.h",
493 ] 498 ]
494 deps += [ 499 deps += [
495 "//components/crash/app", 500 "//components/crash/app",
496 "//components/crash/browser", 501 "//components/crash/browser",
497 ] 502 ]
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 "google/did_run_updater_win.h", 639 "google/did_run_updater_win.h",
635 ] 640 ]
636 } 641 }
637 public_deps += [ 642 public_deps += [
638 "//ui/views", 643 "//ui/views",
639 "//ui/views/controls/webview", 644 "//ui/views/controls/webview",
640 ] 645 ]
641 deps += [ 646 deps += [
642 "//chrome:version_header", 647 "//chrome:version_header",
643 "//chrome/installer/util:strings", 648 "//chrome/installer/util:strings",
649 "//google_update",
Slava Chigrin 2015/01/18 20:58:27 I've added it in https://codereview.chromium.org/8
644 "//third_party/iaccessible2", 650 "//third_party/iaccessible2",
645 "//third_party/isimpledom", 651 "//third_party/isimpledom",
646 "//third_party/wtl", 652 "//third_party/wtl",
647 653
648 #"chrome_process_finder", TODO(GYP) 654 #"chrome_process_finder", TODO(GYP)
649 #"../chrome_elf/chrome_elf.gyp:chrome_elf", TODO(GYP) 655 #"../chrome_elf/chrome_elf.gyp:chrome_elf", TODO(GYP)
650 #"../chrome_elf/chrome_elf.gyp:chrome_elf_constants", TODO(GYP) 656 #"../chrome_elf/chrome_elf.gyp:chrome_elf_constants", TODO(GYP)
651 #"../chrome_elf/chrome_elf.gyp:dll_hash", TODO(GYP) 657 #"../chrome_elf/chrome_elf.gyp:dll_hash", TODO(GYP)
652 #"../google_update/google_update.gyp:google_update", TODO(GYP)
653 "//ui/metro_viewer", 658 "//ui/metro_viewer",
654 "//win8:metro_viewer", 659 "//win8:metro_viewer",
655 ] 660 ]
656 } else { 661 } else {
657 # Non-Windows. 662 # Non-Windows.
658 sources += 663 sources +=
659 rebase_path(gypi_values.chrome_browser_non_win_sources, ".", "//chrome") 664 rebase_path(gypi_values.chrome_browser_non_win_sources, ".", "//chrome")
660 if (toolkit_views) { 665 if (toolkit_views) {
661 deps += [ 666 deps += [
662 "//ui/views", 667 "//ui/views",
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 ] 1068 ]
1064 } 1069 }
1065 1070
1066 if (enable_wifi_bootstrapping) { 1071 if (enable_wifi_bootstrapping) {
1067 sources += [ 1072 sources += [
1068 "local_discovery/wifi/mock_wifi_manager.cc", 1073 "local_discovery/wifi/mock_wifi_manager.cc",
1069 "local_discovery/wifi/mock_wifi_manager.h", 1074 "local_discovery/wifi/mock_wifi_manager.h",
1070 ] 1075 ]
1071 } 1076 }
1072 } 1077 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/metro_utils/BUILD.gn » ('j') | chrome/test/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698