diff options
| author |  Dave MacLachlan <dmaclach@google.com> | 2016-02-04 01:03:38 +0000 |
|---|---|---|
| committer |  David Chen <dzc@google.com> | 2016-02-04 18:10:53 +0000 |
| commit | 9f7a9095bc0909a5fd335c43dae31ab8ac5af2a7 (patch) | |
| tree | 3cc60ba475e8b90e2b504f9a712a46ba69de4470 /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java | |
| parent | 4800626eee5245a062e910b648adb2f291e212c5 (diff) | |
Now that rules find their tools via runfiles, remove unneeded dependencies in rules/tests and move them into the build files.
Fix up environment_plist so it works like the other scripts.
--
MOS_MIGRATED_REVID=113799298
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java | 12 |
1 files changed, 4 insertions, 8 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 4f1cd369b9..9849565699 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 @@ -517,10 +517,6 @@ public class ObjcRuleClasses { .value(env.getLabel(env.getToolsRepository() + "//tools/objc:actoolwrapper"))) .add(attr("$ibtoolwrapper", LABEL).cfg(HOST).exec() .value(env.getLabel(env.getToolsRepository() + "//tools/objc:ibtoolwrapper"))) - // TODO(dmaclach): Adding realpath here should not be required once - // https://github.com/bazelbuild/bazel/issues/285 is fixed. - .add(attr("$realpath", LABEL).cfg(HOST).exec() - .value(env.getLabel(env.getToolsRepository() + "//tools/objc:realpath"))) .build(); } @Override @@ -979,11 +975,11 @@ public class ObjcRuleClasses { .exec() .value(env.getLabel(env.getToolsRepository() + "//tools/objc:bundlemerge"))) .add( - attr("$environment_plist_sh", LABEL) + attr("$environment_plist", LABEL) .cfg(HOST) - .value( - env.getLabel( - env.getToolsRepository() + "//tools/objc:environment_plist.sh"))) + .exec() + .value(env.getLabel( + env.getToolsRepository() + "//tools/objc:environment_plist"))) .build(); } @Override |