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

Merge changes from topic "soong-java-install"

Browse Source 
* changes:
  Revert "Temporarily add method to get java binary tool"
  Move java module installation into Soong
  Fix ctx.InstallFile calls for java modules
  Make HostJavaToolPath use pathForInstall
This commit is contained in:
Treehugger Robot
2021-11-10 17:05:51 +00:00
committed by Gerrit Code Review
parent 33b60e4983 c899d7808e
commit 8a709b149b
10 changed files with 82 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android/config.go
View File

@@ -592,12 +592,11 @@ 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) HostJavaBinToolPath(ctx PathContext, tool string) Path {
path := pathForInstall(ctx, ctx.Config().BuildOS, ctx.Config().BuildArch, "bin", false, tool)
func (c *config) HostJavaToolPath(ctx PathContext, tool string) Path {
path := pathForInstall(ctx, ctx.Config().BuildOS, ctx.Config().BuildArch, "framework", false, tool)
if ctx.Config().KatiEnabled() {
path = path.ToMakePath()
}
return path
}