diff options
| author |  lberki <lberki@google.com> | 2017-07-07 09:48:58 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-07-07 13:37:45 -0400 |
| commit | 38f74a23738f8f1e0e0e3bc49d41a479f311dbe9 (patch) | |
| tree | f19a5bef9900c4f5830f38b0953849feff7da8ac /src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java | |
| parent | 06152ea49275609996578be999d7abc20a1a76bc (diff) | |
Remove all non-essential call sites of methods on Jvm.
This is so that we can eventually route the information it now contains through JavaRuntimeProvider.
RELNOTES: None.
PiperOrigin-RevId: 161196809
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 5f8e1de21b..038974b993 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 @@ -21,9 +21,9 @@ import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.RunfilesSupplierImpl; 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.JavaToolchainProvider; -import com.google.devtools.build.lib.rules.java.Jvm; import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.vfs.PathFragment; @@ -410,7 +410,7 @@ public class ApkActionsBuilder { if (singleJar.getFilename().endsWith(".jar")) { builder .setJarExecutable( - ruleContext.getHostConfiguration().getFragment(Jvm.class).getJavaExecutable(), + JavaCommon.getHostJavaExecutable(ruleContext), singleJar, JavaToolchainProvider.fromRuleContext(ruleContext).getJvmOptions()) .addTransitiveInputs(JavaHelper.getHostJavabaseInputs(ruleContext)); |