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/objc | |
| 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/objc')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java index 81b9bfb19d..60a24514e0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java @@ -54,6 +54,7 @@ import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; import com.google.devtools.build.lib.rules.cpp.CppHelper; import com.google.devtools.build.lib.rules.cpp.FdoSupportProvider; +import com.google.devtools.build.lib.rules.java.JavaCommon; import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider; import com.google.devtools.build.lib.rules.java.JavaGenJarsProvider; import com.google.devtools.build.lib.rules.java.JavaHelper; @@ -476,7 +477,7 @@ public class J2ObjcAspect extends NativeAspectClass implements ConfiguredAspectF JavaCompilationArgsProvider compArgsProvider, J2ObjcSource j2ObjcSource) { CustomCommandLine.Builder argBuilder = CustomCommandLine.builder(); - PathFragment javaExecutable = ruleContext.getFragment(Jvm.class, HOST).getJavaExecutable(); + PathFragment javaExecutable = JavaCommon.getHostJavaExecutable(ruleContext); argBuilder.add("--java").add(javaExecutable.getPathString()); Artifact j2ObjcDeployJar = ruleContext.getPrerequisiteArtifact("$j2objc", Mode.HOST); |