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

Make HostJavaToolPath use pathForInstall

Browse Source 
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:
Colin Cross
2021-11-03 13:31:22 -07:00
parent c602297226
commit ae5330a2d9
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

@@ -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 {