1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
index e85a7f0658..93e54def4b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
@@ -56,8 +56,7 @@ public class AppleCommandLineOptions extends FragmentOptions {
 
   @Option(
     name = "watchos_sdk_version",
-    // TODO(bazel-team): Make this flag optional, and infer SDKROOT based on executor default.
-    defaultValue = DEFAULT_WATCHOS_SDK_VERSION,
+    defaultValue = "null",
     converter = DottedVersionConverter.class,
     category = "build",
     help = "Specifies the version of the WatchOS SDK to use to build WatchOS applications."
@@ -66,8 +65,7 @@ public class AppleCommandLineOptions extends FragmentOptions {
 
   @Option(
     name = "tvos_sdk_version",
-    // TODO(bazel-team): Make this flag optional, and infer SDKROOT based on executor default.
-    defaultValue = DEFAULT_APPLETVOS_SDK_VERSION,
+    defaultValue = "null",
     converter = DottedVersionConverter.class,
     category = "build",
     help = "Specifies the version of the AppleTVOS SDK to use to build AppleTVOS applications."
@@ -76,8 +74,7 @@ public class AppleCommandLineOptions extends FragmentOptions {
 
   @Option(
     name = "macosx_sdk_version",
-    // TODO(bazel-team): Make this flag optional, and infer SDKROOT based on executor default.
-    defaultValue = DEFAULT_MACOSX_SDK_VERSION,
+    defaultValue = "null",
     converter = DottedVersionConverter.class,
     category = "build",
     help = "Specifies the version of the Mac OS X SDK to use to build Mac OS X applications."
@@ -229,6 +226,9 @@ public class AppleCommandLineOptions extends FragmentOptions {
     host.xcodeVersionConfig = xcodeVersionConfig;
     host.xcodeVersion = xcodeVersion;
     host.iosSdkVersion = iosSdkVersion;
+    host.watchOsSdkVersion = watchOsSdkVersion;
+    host.tvOsSdkVersion = tvOsSdkVersion;
+    host.macOsXSdkVersion = macOsXSdkVersion;
     host.appleBitcodeMode = appleBitcodeMode;
 
     return host;