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

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

Issue 1117063004: Revert of Add a GN flag for the Windows multi-dll build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « chrome/app/resources/BUILD.gn ('k') | chrome/browser/policy/BUILD.gn » ('j') | 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/chrome_build.gni")
6 import("//build/config/crypto.gni") 5 import("//build/config/crypto.gni")
7 import("//build/config/features.gni") 6 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
9 8
10 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
11 # produces a conflict for the "grit" template so we have to only include one. 10 # produces a conflict for the "grit" template so we have to only include one.
12 if (is_android) { 11 if (is_android) {
13 import("//build/config/android/rules.gni") 12 import("//build/config/android/rules.gni")
14 } else { 13 } else {
15 import("//tools/grit/grit_rule.gni") 14 import("//tools/grit/grit_rule.gni")
(...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1131 ] 1130 ]
1132 } 1131 }
1133 1132
1134 if (enable_wifi_bootstrapping) { 1133 if (enable_wifi_bootstrapping) {
1135 sources += [ 1134 sources += [
1136 "local_discovery/wifi/mock_wifi_manager.cc", 1135 "local_discovery/wifi/mock_wifi_manager.cc",
1137 "local_discovery/wifi/mock_wifi_manager.h", 1136 "local_discovery/wifi/mock_wifi_manager.h",
1138 ] 1137 ]
1139 } 1138 }
1140 } 1139 }
OLDNEW
« no previous file with comments | « chrome/app/resources/BUILD.gn ('k') | chrome/browser/policy/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698