C++: Changes to public API usable only from builtins

RELNOTES:none PiperOrigin-RevId: 401472250
bazelbuild · Oct 7, 2021 · 2571ce2 · 2571ce2
1 parent cecb3f1
commit 2571ce2
Show file tree

Hide file tree

Showing 5 changed files with 214 additions and 130 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java
@@ -89,6 +89,7 @@ public Tuple compile(
       Object textualHeaders,
       Object additionalExportedHeaders,
       Sequence<?> includes, // <String> expected
+      Object looseIncludes,
       Sequence<?> quoteIncludes, // <String> expected
       Sequence<?> systemIncludes, // <String> expected
       Sequence<?> frameworkIncludes, // <String> expected
@@ -98,6 +99,7 @@ public Tuple compile(
       String stripIncludePrefix,
       Sequence<?> userCompileFlags, // <String> expected
       Sequence<?> ccCompilationContexts, // <CcCompilationContext> expected
+      Object implementationCcCompilationContexts,
       String name,
       boolean disallowPicOutputs,
       boolean disallowNopicOutputs,
@@ -112,6 +114,7 @@ public Tuple compile(
       Object language,
       Object purpose,
       Object grepIncludes,
+      Object coptsFilter,
       StarlarkThread thread)
       throws EvalException, InterruptedException {
     return compile(
@@ -124,6 +127,7 @@ public Tuple compile(
         textualHeaders,
         additionalExportedHeaders,
         includes,
+        looseIncludes,
         quoteIncludes,
         systemIncludes,
         frameworkIncludes,
@@ -133,6 +137,7 @@ public Tuple compile(
         stripIncludePrefix,
         userCompileFlags,
         ccCompilationContexts,
+        implementationCcCompilationContexts,
         name,
         disallowPicOutputs,
         disallowNopicOutputs,
@@ -149,6 +154,7 @@ public Tuple compile(
         variablesExtension,
         language,
         purpose,
+        coptsFilter,
         thread);
   }
 

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
@@ -584,7 +584,7 @@ public CcCompilationHelper setCopts(ImmutableList<String> copts) {
   }
 
   /** Sets a pattern that is used to filter copts; set to {@code null} for no filtering. */
-  private void setCoptsFilter(CoptsFilter coptsFilter) {
+  public void setCoptsFilter(CoptsFilter coptsFilter) {
     this.coptsFilter = Preconditions.checkNotNull(coptsFilter);
   }
 
@@ -637,8 +637,8 @@ public CcCompilationHelper addImplementationDepsCcCompilationContexts(
    * Sets the given directories to by loose include directories that are only allowed to be
    * referenced when headers checking is {@link HeadersCheckingMode#LOOSE}.
    */
-  private void setLooseIncludeDirs(Set<PathFragment> looseIncludeDirs) {
-    this.looseIncludeDirs = looseIncludeDirs;
+  public void setLooseIncludeDirs(Set<PathFragment> looseIncludeDirs) {
+    this.looseIncludeDirs = Preconditions.checkNotNull(looseIncludeDirs);
   }
 
   /**