diff options
author | 2016-07-29 17:23:25 +0000 | |
---|---|---|
committer | 2016-07-29 17:41:52 +0000 | |
commit | 722fb2d2188875cd7cb62d36dc43d463e5482da3 (patch) | |
tree | 8fcbf0f90c34a8939b1830787ef8b4530361b82f | |
parent | 500d7f5e575c413cdd83a2a63e344bdac6c1f5b9 (diff) |
Replace calls to SpawnAction$Builder#addInputs(NestedSet) with addTransitiveInputs
--
MOS_MIGRATED_REVID=128820723
4 files changed, 6 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java index 6a5ff8e112..b963947d87 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java @@ -308,7 +308,7 @@ public class AndroidIdlHelper { ruleContext.registerAction(new SpawnAction.Builder() .setExecutable(sdk.getAidl()) .addInput(idl) - .addInputs(idlImports) + .addTransitiveInputs(idlImports) .addInput(sdk.getFrameworkAidl()) .addOutput(output) .addArgument("-b") // Fail if trying to compile a parcelable. diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/JackCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/android/JackCompilationHelper.java index c067d366aa..dea28d9c80 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/JackCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/JackCompilationHelper.java @@ -280,7 +280,7 @@ public final class JackCompilationHelper { ruleContext.registerAction( new SpawnAction.Builder() .setExecutable(jackBinary) - .addInputs(transitiveJackLibraries) + .addTransitiveInputs(transitiveJackLibraries) .addInputs(proguardSpecs) .addInputs(manualMainDexList.asSet()) .addOutput(outputZip) @@ -523,9 +523,9 @@ public final class JackCompilationHelper { ruleContext.registerAction( new SpawnAction.Builder() .setExecutable(jackBinary) - .addInputs(classpathJackLibraries) + .addTransitiveInputs(classpathJackLibraries) .addOutput(outputArtifact) - .addInputs(processorClasspathJars) + .addTransitiveInputs(processorClasspathJars) .addInputs(resources.values()) .addInputs(sourceJars) .addInputs(javaSources) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java index 2f57efb8a6..7863b1c4ca 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java @@ -410,7 +410,7 @@ final class ProtoSupport { ruleContext.registerAction( ObjcRuleClasses.spawnOnDarwinActionBuilder() .setMnemonic("GenObjcProtos") - .addInputs(getGenerateActionInputs()) + .addTransitiveInputs(getGenerateActionInputs()) .addOutputs(getGenerateActionOutputs()) .setExecutable(new PathFragment("/usr/bin/python")) .setCommandLine(getGenerateCommandLine()) diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java index 2c334431e8..51e6f97aae 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java @@ -515,9 +515,7 @@ public final class PyCommon { TransitiveInfoCollection pythonTarget = ruleContext.getPrerequisite(hostPython2RuntimeAttribute, Mode.HOST); if (pythonTarget != null) { - builder.addInputs(pythonTarget - .getProvider(FileProvider.class) - .getFilesToBuild()); + builder.addTransitiveInputs(pythonTarget.getProvider(FileProvider.class).getFilesToBuild()); } builder.addInputArgument(source); |