From ae5330a2d9d71fe6b61b0ca3ec02e18591de519d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 3 Nov 2021 13:31:22 -0700 Subject: [PATCH] Make HostJavaToolPath use pathForInstall Use pathForInstall instead of PathForOutput for HostJavaToolPath so that it internally produces an InstallPath that can later support being converted to Make installpath. Bug: 204136549 Test: m checkbuild Change-Id: If4f5d3552b27ffe6b9bc709c4a08d9513c49ef7d --- android/config.go | 5 +++-- java/droiddoc.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/android/config.go b/android/config.go index 1f96649d4..732015e7a 100644 --- a/android/config.go +++ b/android/config.go @@ -591,8 +591,9 @@ func (c *config) HostJNIToolPath(ctx PathContext, lib string) Path { return path } -func (c *config) HostJavaToolPath(ctx PathContext, path string) Path { - return PathForOutput(ctx, "host", c.PrebuiltOS(), "framework", path) +func (c *config) HostJavaToolPath(ctx PathContext, tool string) Path { + path := pathForInstall(ctx, ctx.Config().BuildOS, ctx.Config().BuildArch, "framework", false, tool) + return path } func (c *config) HostJavaBinToolPath(ctx PathContext, tool string) Path { diff --git a/java/droiddoc.go b/java/droiddoc.go index 869a5982d..c84a15c1f 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -769,8 +769,8 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { d.Javadoc.docZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"docs.zip") - jsilver := android.PathForOutput(ctx, "host", ctx.Config().PrebuiltOS(), "framework", "jsilver.jar") - doclava := android.PathForOutput(ctx, "host", ctx.Config().PrebuiltOS(), "framework", "doclava.jar") + jsilver := ctx.Config().HostJavaToolPath(ctx, "jsilver.jar") + doclava := ctx.Config().HostJavaToolPath(ctx, "doclava.jar") outDir := android.PathForModuleOut(ctx, "out") srcJarDir := android.PathForModuleOut(ctx, "srcjars")