commit c01a43a22e7fa25c08b42d0018a47feb379f2815
author rosica <rosica@google.com> Thu Jul 18 10:49:35 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jul 18 10:50:34 2019 -0700
tree 29e2e6e0e3285fed48bd04e423848669a48668c1
parent 1186ceccd13efaada5693933f41faa52c77645d3

Add -iquote include paths for a target before the -iquote includes from its dependencies

RELNOTES: None.
PiperOrigin-RevId: 258802249

src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
index 62fdb9c..ea8e23b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
@@ -898,6 +898,7 @@
 
     ccCompilationContextBuilder.addSystemIncludeDirs(systemIncludeDirs);
     ccCompilationContextBuilder.addFrameworkIncludeDirs(frameworkIncludeDirs);
+    ccCompilationContextBuilder.addQuoteIncludeDirs(quoteIncludeDirs);
 
     for (PathFragment includeDir : includeDirs) {
       ccCompilationContextBuilder.addIncludeDir(includeDir);
@@ -995,7 +996,6 @@
       }
     }
     ccCompilationContextBuilder.setPurpose(purpose);
-    ccCompilationContextBuilder.addQuoteIncludeDirs(quoteIncludeDirs);
     return ccCompilationContextBuilder.build();
   }