diff options
author | 2016-08-31 17:04:17 +0000 | |
---|---|---|
committer | 2016-09-01 08:31:41 +0000 | |
commit | 381850e6be67db046409541dec372d19dbc5f87f (patch) | |
tree | bc6bdbd339816e25e8def0dd8936bca4b429a57d /src/test/java/com/google/devtools/build | |
parent | f04849bda4e0bf1e0ce3f091dab9722de72df1a6 (diff) |
xcode_configure repository rule for determining locally installed versions of xcode to select between, relaxing the requirement that users specify --xcode_version and --ios_sdk_version even if they have only one version installed.
RELNOTES: On mac devices, detect locally installed versions of xcode to:
1. Use a sensible default if xcode is required but --xcode_version is unspecified.
2. Use sensible default iOS SDK version for the targeted version of xcode if ios_sdk_version is unspecified.
--
MOS_MIGRATED_REVID=131841587
Diffstat (limited to 'src/test/java/com/google/devtools/build')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index a17305be3f..5b47d44f86 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -64,6 +64,7 @@ public final class BazelAnalysisMock extends AnalysisMock { new ArrayList<>( ImmutableList.of( "local_repository(name = 'bazel_tools', path = '" + bazelToolWorkspace + "')", + "local_repository(name = 'local_config_xcode', path = '/local_config_xcode')", "bind(", " name = 'objc_proto_lib',", " actual = '//objcproto:ProtocolBuffers_lib',", @@ -79,6 +80,8 @@ public final class BazelAnalysisMock extends AnalysisMock { "bind(name = 'android/sdk', actual='@bazel_tools//tools/android:sdk')", "bind(name = 'tools/python', actual='//tools/python')")); + config.create( + "/local_config_xcode/BUILD", "xcode_config(name = 'host_xcodes')"); config.overwrite("WORKSPACE", workspaceContents.toArray(new String[workspaceContents.size()])); config.create("/bazel_tools_workspace/WORKSPACE", "workspace(name = 'bazel_tools')"); config.create( |