diff options
| author |  tomlu <tomlu@google.com> | 2017-09-19 15:49:26 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-09-19 17:18:06 +0200 |
| commit | 6ffdbf7a5ad8976e01df768a7c5537d9cd814bd9 (patch) | |
| tree | eb33ab19beb3ce85f4cdbce50d915b44e3bb838b /src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java | |
| parent | 33a361fcc34b6b7c9dbec31209ec22f0ddfbb2ff (diff) | |
Defer expanding sources to path fragments until execution for source jar actions.
PiperOrigin-RevId: 169234341
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java index 693e15ae8f..7ce177ae8d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java @@ -18,7 +18,6 @@ import static com.google.devtools.build.lib.rules.java.DeployArchiveBuilder.Comp import static java.util.stream.Collectors.toCollection; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Streams; import com.google.devtools.build.lib.actions.Artifact; @@ -63,7 +62,6 @@ import com.google.devtools.build.lib.rules.java.SingleJarActionBuilder; import com.google.devtools.build.lib.rules.java.proto.GeneratedExtensionRegistryProvider; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.util.OS; -import com.google.devtools.build.lib.vfs.PathFragment; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; @@ -292,7 +290,8 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor // DeployArchiveAction ? Needs a few changes there as we can't pass inputs SingleJarActionBuilder.createSourceJarAction( ruleContext, - ImmutableMap.<PathFragment, Artifact>of(), + javaSemantics, + ImmutableList.of(), transitiveSourceJars, ruleContext.getImplicitOutputArtifact(JavaSemantics.JAVA_BINARY_DEPLOY_SOURCE_JAR)); |