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

Unified Diff: tools/gn/ninja_helper.cc

Issue 236713002: Implement net in GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/tools/tld_cleanup/BUILD.gn ('k') | tools/gn/secondary/tools/grit/grit_rule.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/ninja_helper.cc
diff --git a/tools/gn/ninja_helper.cc b/tools/gn/ninja_helper.cc
index f84d2b1dc7c61848563cd5ea68134b217c3176a9..e5d1ff8efa1be39e6133cac40f74eb83adaedf2b 100644
--- a/tools/gn/ninja_helper.cc
+++ b/tools/gn/ninja_helper.cc
@@ -212,23 +212,16 @@ std::string NinjaHelper::GetRuleForSourceType(const Settings* settings,
return prefix + "cc";
if (type == SOURCE_CC)
return prefix + "cxx";
+ if (type == SOURCE_M)
+ return prefix + "objc";
+ if (type == SOURCE_MM)
+ return prefix + "objcxx";
+ if (type == SOURCE_RC)
+ return prefix + "rc";
+ if (type == SOURCE_S)
+ return prefix + "cc"; // Assembly files just get compiled by CC.
// TODO(brettw) asm files.
- if (settings->IsMac()) {
- if (type == SOURCE_M)
- return prefix + "objc";
- if (type == SOURCE_MM)
- return prefix + "objcxx";
- }
-
- if (settings->IsWin()) {
- if (type == SOURCE_RC)
- return prefix + "rc";
- } else {
- if (type == SOURCE_S)
- return prefix + "cc"; // Assembly files just get compiled by CC.
- }
-
return std::string();
}
« no previous file with comments | « net/tools/tld_cleanup/BUILD.gn ('k') | tools/gn/secondary/tools/grit/grit_rule.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698