Index: tools/gn/toolchain.cc |
diff --git a/tools/gn/toolchain.cc b/tools/gn/toolchain.cc |
index cdd70c02f5546740fdf6adb3c4bd0929f21090ea..826c875b6ca4958738340672dc974575c6294cd8 100644 |
--- a/tools/gn/toolchain.cc |
+++ b/tools/gn/toolchain.cc |
@@ -18,6 +18,7 @@ const char* Toolchain::kToolRc = "rc"; |
const char* Toolchain::kToolAsm = "asm"; |
const char* Toolchain::kToolAlink = "alink"; |
const char* Toolchain::kToolSolink = "solink"; |
+const char* Toolchain::kToolSolinkModule = "solink_module"; |
const char* Toolchain::kToolLink = "link"; |
const char* Toolchain::kToolStamp = "stamp"; |
const char* Toolchain::kToolCopy = "copy"; |
@@ -49,6 +50,7 @@ Toolchain::ToolType Toolchain::ToolNameToType(const base::StringPiece& str) { |
if (str == kToolAsm) return TYPE_ASM; |
if (str == kToolAlink) return TYPE_ALINK; |
if (str == kToolSolink) return TYPE_SOLINK; |
+ if (str == kToolSolinkModule) return TYPE_SOLINK_MODULE; |
if (str == kToolLink) return TYPE_LINK; |
if (str == kToolStamp) return TYPE_STAMP; |
if (str == kToolCopy) return TYPE_COPY; |
@@ -66,6 +68,7 @@ std::string Toolchain::ToolTypeToName(ToolType type) { |
case TYPE_ASM: return kToolAsm; |
case TYPE_ALINK: return kToolAlink; |
case TYPE_SOLINK: return kToolSolink; |
+ case TYPE_SOLINK_MODULE: return kToolSolinkModule; |
case TYPE_LINK: return kToolLink; |
case TYPE_STAMP: return kToolStamp; |
case TYPE_COPY: return kToolCopy; |
@@ -140,6 +143,8 @@ Toolchain::ToolType Toolchain::GetToolTypeForTargetFinalOutput( |
return Toolchain::TYPE_LINK; |
case Target::SHARED_LIBRARY: |
return Toolchain::TYPE_SOLINK; |
+ case Target::LOADABLE_MODULE: |
+ return Toolchain::TYPE_SOLINK_MODULE; |
case Target::STATIC_LIBRARY: |
return Toolchain::TYPE_ALINK; |
case Target::SOURCE_SET: |