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

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

Issue 877333002: Fix build flakes in GN build due to wrong deps for grit action. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase after revert of original, problematic CL. Created 5 years, 10 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/secondary/tools/grit/grit_rule.gni ('k') | 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/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 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 "-E", 796 "-E",
797 "additional_modules_list_file=" + 797 "additional_modules_list_file=" +
798 rebase_path(additional_modules_list_file, root_build_dir), 798 rebase_path(additional_modules_list_file, root_build_dir),
799 "-E", 799 "-E",
800 "omnibox_mojom_file=" + rebase_path(omnibox_mojom_file, root_build_dir), 800 "omnibox_mojom_file=" + rebase_path(omnibox_mojom_file, root_build_dir),
801 ] 801 ]
802 802
803 deps = [ 803 deps = [
804 ":about_credits", 804 ":about_credits",
805 ":chrome_internal_resources_gen", 805 ":chrome_internal_resources_gen",
806 "//chrome/browser/ui/webui/omnibox:mojo_bindings", 806 ]
807 "//mojo/environment:chromium", 807 inputs = [
808 omnibox_mojom_file,
808 ] 809 ]
809 } 810 }
810 811
811 # GYP version: chrome/chrome_resource.gyp:about_credits 812 # GYP version: chrome/chrome_resource.gyp:about_credits
812 action("about_credits") { 813 action("about_credits") {
813 script = "//tools/licenses.py" 814 script = "//tools/licenses.py"
814 815
815 inputs = [ 816 inputs = [
816 # This is not a complete list. TODO(phajdan.jr, dbeam): licenses.py needs to 817 # This is not a complete list. TODO(phajdan.jr, dbeam): licenses.py needs to
817 # generate a .d file with all the licenses/credits that about:credits uses. 818 # generate a .d file with all the licenses/credits that about:credits uses.
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 ] 1089 ]
1089 } 1090 }
1090 1091
1091 if (enable_wifi_bootstrapping) { 1092 if (enable_wifi_bootstrapping) {
1092 sources += [ 1093 sources += [
1093 "local_discovery/wifi/mock_wifi_manager.cc", 1094 "local_discovery/wifi/mock_wifi_manager.cc",
1094 "local_discovery/wifi/mock_wifi_manager.h", 1095 "local_discovery/wifi/mock_wifi_manager.h",
1095 ] 1096 ]
1096 } 1097 }
1097 } 1098 }
OLDNEW
« no previous file with comments | « build/secondary/tools/grit/grit_rule.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698