diff options
| author |  Googler <noreply@google.com> | 2015-08-03 18:23:11 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-08-04 09:09:21 +0000 |
| commit | 46e805787c395b856441a44ee454a0497ebe5bbd (patch) | |
| tree | ab1fff82d57ca39eb0c49f9610fa350e60560e64 /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java | |
| parent | 52455102107bfba52347c18e2f02ae148f127958 (diff) | |
Rollback of commit da3cb806351e929becef19652c65d39efa61b9d9.
*** Reason for rollback ***
Breaking builds. []
*** Original change description ***
RELNOTES: actoolzip, momczip and swiftstdlibtoolzip have all been made into bash scripts and have been renamed to actoolwrapper, momcwrapper and swiftstdlibtoolwrapper respectively. The old versions will be deleted in a later change.
--
MOS_MIGRATED_REVID=99742398
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 | 13 |
1 files changed, 7 insertions, 6 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 681ef22615..4009d5e292 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 @@ -65,6 +65,7 @@ public class ObjcRuleClasses { static final PathFragment LIBTOOL = new PathFragment(BIN_DIR + "/libtool"); static final PathFragment DSYMUTIL = new PathFragment(BIN_DIR + "/dsymutil"); static final PathFragment LIPO = new PathFragment(BIN_DIR + "/lipo"); + static final PathFragment SWIFT_STDLIB_TOOL = new PathFragment(BIN_DIR + "/swift-stdlib-tool"); static final PathFragment STRIP = new PathFragment(BIN_DIR + "/strip"); private static final PathFragment JAVA = new PathFragment("/usr/bin/java"); @@ -454,14 +455,16 @@ public class ObjcRuleClasses { return builder .add(attr("$plmerge", LABEL).cfg(HOST).exec() .value(env.getLabel("//tools/objc:plmerge"))) - .add(attr("$actoolwrapper", LABEL).cfg(HOST).exec() - .value(env.getLabel("//tools/objc:actoolwrapper"))) + .add(attr("$actoolzip_deploy", LABEL).cfg(HOST) + .value(env.getLabel("//tools/objc:actoolzip_deploy.jar"))) .add(attr("$ibtoolwrapper", LABEL).cfg(HOST).exec() .value(env.getLabel("//tools/objc:ibtoolwrapper"))) // TODO(dmaclach): Adding realpath here should not be required once // https://github.com/google/bazel/issues/285 is fixed. .add(attr("$realpath", LABEL).cfg(HOST).exec() .value(env.getLabel("//tools/objc:realpath"))) + .add(attr("$swiftstdlibtoolzip_deploy", LABEL).cfg(HOST) + .value(env.getLabel("//tools/objc:swiftstdlibtoolzip_deploy.jar"))) .build(); } @Override @@ -808,10 +811,8 @@ public class ObjcRuleClasses { <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/ .add(attr("families", STRING_LIST) .value(ImmutableList.of(TargetDeviceFamily.IPHONE.getNameInRule()))) - .add(attr("$momcwrapper", LABEL).cfg(HOST).exec() - .value(env.getLabel("//tools/objc:momcwrapper"))) - .add(attr("$swiftstdlibtoolwrapper", LABEL).cfg(HOST).exec() - .value(env.getLabel("//tools/objc:swiftstdlibtoolwrapper"))) + .add(attr("$momczip_deploy", LABEL).cfg(HOST) + .value(env.getLabel("//tools/objc:momczip_deploy.jar"))) .build(); } @Override |