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
This commit is contained in:
@@ -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 {
|
||||
|
@@ -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")
|
||||
|
Reference in New Issue
Block a user