Use xcode_config build target for actions which need to resolve an xcode version.

--
MOS_MIGRATED_REVID=111978539

1 files changed, 10 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
index afe15f4090..ad23526dd9 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
@@ -55,16 +55,19 @@ public final class BazelMockCcSupport extends MockCcSupport {
     }
   }
 
+  @Override
   protected String getRealFilesystemCrosstoolTopPath() {
     assert false;
     return null;
   }
 
+  @Override
   protected String[] getRealFilesystemTools(String crosstoolTop) {
     assert false;
     return null;
   }
 
+  @Override
   protected ImmutableList<String> getCrosstoolArchs() {
     return CROSSTOOL_ARCHS;
   }
@@ -109,12 +112,17 @@ public final class BazelMockCcSupport extends MockCcSupport {
     config.create(
         "/bazel_tools_workspace/tools/cpp/CROSSTOOL",
         readFromResources("com/google/devtools/build/lib/MOCK_CROSSTOOL"));
+    config.create(
+        "/bazel_tools_workspace/tools/objc/BUILD",
+        "xcode_config(name = 'host_xcodes')");
   }
 
+  @Override
   protected String getMockCrosstoolVersion() {
     return "gcc-4.4.0-glibc-2.3.6";
   }
 
+  @Override
   protected String readCrosstoolFile() throws IOException {
     return readFromResources("com/google/devtools/build/lib/MOCK_CROSSTOOL");
   }
@@ -124,10 +132,12 @@ public final class BazelMockCcSupport extends MockCcSupport {
     return new String(ByteStreams.toByteArray(in), UTF_8);
   }
 
+  @Override
   public String getMockCrosstoolPath() {
     return "/bazel_tools_workspace/tools/cpp/";
   }
 
+  @Override
   public Predicate<String> labelNameFilter() {
     return CC_LABEL_NAME_FILTER;
   }