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

Side by Side Diff: BUILD.gn

Issue 2192833002: Fix GN generation for WinASAN build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | build/config/BUILDCONFIG.gn » ('j') | build/config/sanitizers/BUILD.gn » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 # This is the root build file for GN. GN will start processing by loading this 5 # This is the root build file for GN. GN will start processing by loading this
6 # file, and recursively load all dependencies until all dependencies are either 6 # file, and recursively load all dependencies until all dependencies are either
7 # resolved or known not to exist (which will cause the build to fail). So if 7 # resolved or known not to exist (which will cause the build to fail). So if
8 # you add a new build file, there must be some path of dependencies from this 8 # you add a new build file, there must be some path of dependencies from this
9 # file to your new one or GN won't know about it. 9 # file to your new one or GN won't know about it.
10 10
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 if (is_win) { 102 if (is_win) {
103 group("chrome_official_builder_no_unittests") { 103 group("chrome_official_builder_no_unittests") {
104 deps = [ 104 deps = [
105 "//chrome/installer/gcapi", 105 "//chrome/installer/gcapi",
106 "//chrome/installer/mini_installer", 106 "//chrome/installer/mini_installer",
107 "//components/policy:pack_policy_templates", 107 "//components/policy:pack_policy_templates",
108 "//courgette", 108 "//courgette",
109 "//courgette:copy_courgette_binaries", 109 "//courgette:copy_courgette_binaries",
110 "//remoting/webapp", 110 "//remoting/webapp",
111 ] 111 ]
112
112 if (target_cpu == "x86") { 113 if (target_cpu == "x86") {
113 deps += [ "//courgette(//build/toolchain/win:x64)" ] 114 if (is_clang) {
114 115 deps += [ "//courgette(//build/toolchain/win:clang_x64)" ]
116 } else {
117 deps += [ "//courgette(//build/toolchain/win:x64)" ]
chrisha 2016/07/28 15:29:57 I'm not 100% up on how to do things in GN. Does it
etienneb 2016/07/28 15:35:39 I was expecting a cleaner way to do this: deps
118 }
115 if (is_chrome_branded) { 119 if (is_chrome_branded) {
116 deps += [ "//remoting/host:remoting_host_installation" ] 120 deps += [ "//remoting/host:remoting_host_installation" ]
117 } 121 }
118 } 122 }
119 } 123 }
120 124
121 group("chrome_official_builder") { 125 group("chrome_official_builder") {
122 testonly = true 126 testonly = true
123 127
124 deps = [ 128 deps = [
(...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 assert(target_name != "") # Mark as used. 1045 assert(target_name != "") # Mark as used.
1042 sources = invoker.actual_sources 1046 sources = invoker.actual_sources
1043 assert( 1047 assert(
1044 sources == invoker.actual_sources, 1048 sources == invoker.actual_sources,
1045 "Do not use a platform name in your output directory (found \"$root_build_ dir\"). http://crbug.com/548283") 1049 "Do not use a platform name in your output directory (found \"$root_build_ dir\"). http://crbug.com/548283")
1046 } 1050 }
1047 1051
1048 assert_valid_out_dir("_unused") { 1052 assert_valid_out_dir("_unused") {
1049 actual_sources = [ "$root_build_dir/foo" ] 1053 actual_sources = [ "$root_build_dir/foo" ]
1050 } 1054 }
OLDNEW
« no previous file with comments | « no previous file | build/config/BUILDCONFIG.gn » ('j') | build/config/sanitizers/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698