StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make HostJavaToolPath use pathForInstall am: ae5330a2d9 am: a8bd977845 am: e8aadabe21

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880648

Change-Id: I6e0bf0060007a6e86661b7b36ece81a96191cc77
This commit is contained in:
Colin Cross
2021-11-10 17:52:39 +00:00
committed by Automerger Merge Worker
parent 2883262457 e8aadabe21
commit d1d1dea4da
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/config.go
View File

@@ -592,8 +592,9 @@ func (c *config) HostJNIToolPath(ctx PathContext, lib string) Path {
return path return path
} }
func (c *config) HostJavaToolPath(ctx PathContext, path string) Path { func (c *config) HostJavaToolPath(ctx PathContext, tool string) Path {
return PathForOutput(ctx, "host", c.PrebuiltOS(), "framework", path) path := pathForInstall(ctx, ctx.Config().BuildOS, ctx.Config().BuildArch, "framework", false, tool)
return path
} }
func (c *config) HostJavaBinToolPath(ctx PathContext, tool string) Path { func (c *config) HostJavaBinToolPath(ctx PathContext, tool string) Path {

4
java/droiddoc.go
View File

@@ -769,8 +769,8 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
d.Javadoc.docZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"docs.zip") d.Javadoc.docZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"docs.zip")
jsilver := android.PathForOutput(ctx, "host", ctx.Config().PrebuiltOS(), "framework", "jsilver.jar") jsilver := ctx.Config().HostJavaToolPath(ctx, "jsilver.jar")
doclava := android.PathForOutput(ctx, "host", ctx.Config().PrebuiltOS(), "framework", "doclava.jar") doclava := ctx.Config().HostJavaToolPath(ctx, "doclava.jar")
outDir := android.PathForModuleOut(ctx, "out") outDir := android.PathForModuleOut(ctx, "out")
srcJarDir := android.PathForModuleOut(ctx, "srcjars") srcJarDir := android.PathForModuleOut(ctx, "srcjars")