commit 4967a710c84587c654b56c828382219c3937dacb
author Pirama Arumuga Nainar <pirama@google.com> Mon Sep 19 22:19:55 2016 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Thu Oct 06 21:01:10 2016 -0700
tree ae0d585998e15fc175ca3e9146b21e53f290624b
parent d27d7495bf70da4faffda3d8083396e0e07f2931

Update aosp/master Clang for rebase to r275480

Bug: http://b/31320715

This merges commit ac9cc4764cf47a6c3f031687d8592e080c9f5001 from
aosp/dev.

Test: Build AOSP and run RenderScript tests (host tests for slang and
libbcc, RsTest, CTS)

Change-Id: Ic2875e5c3673c83448cd7d1013861e42947b1b55

lib/Driver/CrossWindowsToolChain.cpp

diff --git a/lib/Driver/CrossWindowsToolChain.cpp b/lib/Driver/CrossWindowsToolChain.cpp
index 57bf896..4ebbc53 100644
--- a/lib/Driver/CrossWindowsToolChain.cpp
+++ b/lib/Driver/CrossWindowsToolChain.cpp
@@ -62,6 +62,8 @@
     llvm::sys::path::append(ResourceDir, "include");
     addSystemInclude(DriverArgs, CC1Args, ResourceDir);
   }
+  for (const auto &P : DriverArgs.getAllArgValues(options::OPT_isystem_after))
+    addSystemInclude(DriverArgs, CC1Args, P);
   addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
 }