diff options
| author |  Ulf Adams <ulfjack@google.com> | 2016-07-05 14:05:21 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-07-06 09:41:41 +0000 |
| commit | b1482984c1d84fbd571296048708f7e0863f7d8e (patch) | |
| tree | e14ce8c94e5addd0b15fcbd8b14226f21c4389ff | |
| parent | fccc34178f0d1b0a4e4cb7b4a41ed8e957328a77 (diff) | |
Move MOCK_CROSSTOOL to build/lib/analysis/mock.
--
MOS_MIGRATED_REVID=126633568
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/BUILD | 2 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL (renamed from src/test/java/com/google/devtools/build/lib/MOCK_CROSSTOOL) | 0 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java | 10 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 5f997d5b0c..1e9e2f8a74 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -273,7 +273,7 @@ java_library( "exec/util/*.java", ]), resources = [ - "MOCK_CROSSTOOL", + "analysis/mock/MOCK_CROSSTOOL", ], tags = ["analysis"], exports = [ diff --git a/src/test/java/com/google/devtools/build/lib/MOCK_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL index 5f39647a60..5f39647a60 100644 --- a/src/test/java/com/google/devtools/build/lib/MOCK_CROSSTOOL +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL 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 a451e81101..d43ce9a77b 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 @@ -26,8 +26,11 @@ import java.io.InputStream; * Bazel implementation of {@link MockCcSupport} */ public final class BazelMockCcSupport extends MockCcSupport { - public static final BazelMockCcSupport INSTANCE = new BazelMockCcSupport(); + + private static final String MOCK_CROSSTOOL_PATH = + "com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL"; + /** Filter to remove implicit dependencies of C/C++ rules. */ private static final Predicate<String> CC_LABEL_NAME_FILTER = new Predicate<String>() { @@ -117,8 +120,7 @@ public final class BazelMockCcSupport extends MockCcSupport { ")"); config.create( - "/bazel_tools_workspace/tools/cpp/CROSSTOOL", - readFromResources("com/google/devtools/build/lib/MOCK_CROSSTOOL")); + "/bazel_tools_workspace/tools/cpp/CROSSTOOL", readFromResources(MOCK_CROSSTOOL_PATH)); config.create( "/bazel_tools_workspace/tools/objc/BUILD", "xcode_config(name = 'host_xcodes')"); @@ -131,7 +133,7 @@ public final class BazelMockCcSupport extends MockCcSupport { @Override protected String readCrosstoolFile() throws IOException { - return readFromResources("com/google/devtools/build/lib/MOCK_CROSSTOOL"); + return readFromResources(MOCK_CROSSTOOL_PATH); } public static String readFromResources(String filename) throws IOException { |