diff options
author | Daniel Wagner-Hall <danielwh@google.com> | 2015-03-17 02:07:22 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2015-03-18 13:41:15 +0000 |
commit | db16149bbd490c4693243ebe413a340ed7c905bb (patch) | |
tree | 52e4510b11b7638366bf9d6a3bb72b2635e7818d /src/main/java/com/google/devtools/build | |
parent | 7ad1e0e5cc16c7654711938534a9729729d05ac7 (diff) |
Simplify actoolzip argument flow
--
MOS_MIGRATED_REVID=88789823
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java | 9 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcActionsBuilder.java | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java index e02db5f0b3..f48ad0e024 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.rules.objc; import com.google.common.base.Optional; -import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleContext; @@ -134,12 +133,8 @@ final class BundleSupport { new ObjcRuleClasses.Tools(ruleContext), objcProvider, actoolzipOutput.get(), - new ObjcActionsBuilder.ExtraActoolOutputs(actoolPartialInfoplist), - new ExtraActoolArgs( - new ImmutableList.Builder<String>() - .addAll(extraActoolArgs) - .add("--output-partial-info-plist", actoolPartialInfoplist.getExecPathString()) - .build()), + actoolPartialInfoplist, + extraActoolArgs, targetDeviceFamilies); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcActionsBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcActionsBuilder.java index 30eaabd189..aa9ce3d9b3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcActionsBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcActionsBuilder.java @@ -355,7 +355,7 @@ final class ObjcActionsBuilder { ObjcRuleClasses.Tools tools, ObjcProvider provider, Artifact zipOutput, - ExtraActoolOutputs extraActoolOutputs, + Artifact partialInfoPlist, ExtraActoolArgs extraActoolArgs, Set<TargetDeviceFamily> families) { // TODO(bazel-team): Do not use the deploy jar explicitly here. There is currently a bug where @@ -367,11 +367,12 @@ final class ObjcActionsBuilder { .setMnemonic("AssetCatalogCompile") .addTransitiveInputs(provider.get(ASSET_CATALOG)) .addOutput(zipOutput) - .addOutputs(extraActoolOutputs) + .addOutput(partialInfoPlist) .setCommandLine(actoolzipCommandLine( objcConfiguration, provider, zipOutput, + partialInfoPlist, extraActoolArgs, ImmutableSet.copyOf(families))) .build(context)); @@ -381,6 +382,7 @@ final class ObjcActionsBuilder { final ObjcConfiguration objcConfiguration, final ObjcProvider provider, final Artifact zipOutput, + final Artifact partialInfoPlist, final ExtraActoolArgs extraActoolArgs, final ImmutableSet<TargetDeviceFamily> families) { return new CommandLine() { @@ -393,6 +395,7 @@ final class ObjcActionsBuilder { .add(IosSdkCommands.ACTOOL_PATH) .add("--platform") .add(objcConfiguration.getPlatform().getLowerCaseNameInPlist()) + .add("--output-partial-info-plist").add(partialInfoPlist.getExecPathString()) .add("--minimum-deployment-target").add(objcConfiguration.getMinimumOs()); for (TargetDeviceFamily targetDeviceFamily : families) { args.add("--target-device").add(targetDeviceFamily.name().toLowerCase(Locale.US)); |