diff options
| author |  John Cater <jcater@google.com> | 2018-01-23 05:35:36 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-23 05:37:20 -0800 |
| commit | b4cf329022bb4afd45e96c2990dd869c200dc739 (patch) | |
| tree | 2bb091560231fb693a0e63a6de36ecf53c321850 /src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java | |
| parent | 40d7f49b3e0320bd37b1ea4dcae7022a273f732e (diff) | |
Move all code to lookup JavaRuntimeInfo to static methods on
JavaRuntimeInfo.
Change-Id: Ic338dc9b3e5efa2fee92dba722a46cab743db40c
PiperOrigin-RevId: 182919931
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java index 51e5f6524c..d8bcf18f0d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java @@ -24,7 +24,7 @@ import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.rules.android.AndroidConfiguration.ApkSigningMethod; import com.google.devtools.build.lib.rules.java.JavaCommon; -import com.google.devtools.build.lib.rules.java.JavaHelper; +import com.google.devtools.build.lib.rules.java.JavaRuntimeInfo; import com.google.devtools.build.lib.rules.java.JavaToolchainProvider; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.util.Pair; @@ -427,7 +427,7 @@ public class ApkActionsBuilder { JavaCommon.getHostJavaExecutable(ruleContext), singleJar, JavaToolchainProvider.from(ruleContext).getJvmOptions()) - .addTransitiveInputs(JavaHelper.getHostJavabaseInputs(ruleContext)); + .addTransitiveInputs(JavaRuntimeInfo.forHost(ruleContext).javaBaseInputsMiddleman()); } else { builder.setExecutable(singleJar); } |