Merge pull request #60265 from 3405691582/CorrectVFSExclusion

Correct VFS libc modulemap injection condition.

Author: egorzhdan

lib/ClangImporter/ClangIncludePaths.cpp

@@ -171,11 +171,15 @@ createClangArgs(const ASTContext &ctx, clang::driver::Driver &clangDriver) {
   return clangDriverArgs;
 }
 
+static bool shouldInjectGlibcModulemap(const llvm::Triple &triple) {
+  return triple.isOSGlibc() || triple.isOSOpenBSD() || triple.isOSFreeBSD() ||
+         triple.isAndroid();
+}
+
 static SmallVector<std::pair<std::string, std::string>, 2>
 getGlibcFileMapping(ASTContext &ctx) {
   const llvm::Triple &triple = ctx.LangOpts.Target;
-  // We currently only need this when building for Linux.
-  if (!triple.isOSLinux())
+  if (!shouldInjectGlibcModulemap(triple))
     return {};
 
   // Extract the Glibc path from Clang driver.