Header thinning feature now ships the appropriate Apple SDK with header scanner tool to ensure that the correct headers are detected without building any assumptions into the tool.

--
PiperOrigin-RevId: 150238621
MOS_MIGRATED_REVID=150238621

1 files changed, 7 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
index ec93b71ada..da9fd874b7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
@@ -82,6 +82,7 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   private final HeaderDiscovery.DotdPruningMode dotdPruningPlan;
   private final boolean experimentalHeaderThinning;
   private final Label objcHeaderScannerTool;
+  private final Label appleSdk;
   private final boolean generateXcodeProject;
 
   ObjcConfiguration(ObjcCommandLineOptions objcOptions, BuildConfiguration.Options options,
@@ -123,6 +124,7 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
             : HeaderDiscovery.DotdPruningMode.DO_NOT_USE;
     this.experimentalHeaderThinning = objcOptions.experimentalObjcHeaderThinning;
     this.objcHeaderScannerTool = objcOptions.objcHeaderScannerTool;
+    this.appleSdk = objcOptions.appleSdk;
     this.generateXcodeProject = objcOptions.generateXcodeProject;
   }
 
@@ -365,6 +367,11 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
     return objcHeaderScannerTool;
   }
 
+  /** Returns the label for the Apple SDK for current build configuration. */
+  public Label getAppleSdk() {
+    return appleSdk;
+  }
+
   /**
    * Returns {@code true} if an xcodegen project should be added to a target's files to build.
    */