diff options
| author |  Chris Parsons <cparsons@google.com> | 2015-10-26 19:57:04 +0000 |
|---|---|---|
| committer |  Florian Weikert <fwe@google.com> | 2015-10-27 11:49:21 +0000 |
| commit | fea68a325b2a57b72fa6997d729275c5840e16a6 (patch) | |
| tree | bb28d4dc33cb50015cddda36aeeed8a535d7a4a3 /src | |
| parent | 5aafbdd70b2b3d3a83cc5fead6af19a496c5995d (diff) | |
Remove the TOOLS_REPOSITORY prefix for tools/objc:xctest_app.
--
MOS_MIGRATED_REVID=106327492
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java index d0b9406c25..4173d6dd0b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java @@ -817,7 +817,10 @@ public class ObjcRuleClasses { @Override public Object getDefault(AttributeMap rule) { return rule.get(IosTest.IS_XCTEST, Type.BOOLEAN) - ? env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:xctest_app") + // No TOOLS_REPOSITORY prefix for the xctest_app tool; xcode projects + // referencing a dependency under a repository do not work. Thus, + // this target must be available in the target depot. + ? env.getLabel("//tools/objc:xctest_app") : null; } }) @@ -831,8 +834,10 @@ public class ObjcRuleClasses { @Override public Object getDefault(AttributeMap rule) { return rule.get(IosTest.IS_XCTEST, Type.BOOLEAN) - ? env.getLabel( - Constants.TOOLS_REPOSITORY + "//tools/objc:xctest_infoplist") + // No TOOLS_REPOSITORY prefix for the xctest_app tool; xcode projects + // referencing a dependency under a repository do not work. Thus, + // this target must be available in the target depot. + ? env.getLabel("//tools/objc:xctest_infoplist") : null; } }) |