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

Revert "Temporarily add method to get java binary tool"

Browse Source 
Java binaries and cc binaries are in the same directory again, the
separate method can be removed.

Bug: 204136549
Test: m checkbuild
Change-Id: I2e7ca82448aba5c7e54d3c3c376fe14a953ef4af
This commit is contained in:
Colin Cross
2021-11-04 10:25:20 -07:00
parent 24cc4be60b
commit c899d7808e
3 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/config.go
View File

@@ -599,14 +599,6 @@ func (c *config) HostJavaToolPath(ctx PathContext, tool string) Path {
return path return path
} }
func (c *config) HostJavaBinToolPath(ctx PathContext, tool string) Path {
path := pathForInstall(ctx, ctx.Config().BuildOS, ctx.Config().BuildArch, "bin", false, tool)
if ctx.Config().KatiEnabled() {
path = path.ToMakePath()
}
return path
}
// PrebuiltOS returns the name of the host OS used in prebuilts directories. // PrebuiltOS returns the name of the host OS used in prebuilts directories.
func (c *config) PrebuiltOS() string { func (c *config) PrebuiltOS() string {
switch runtime.GOOS { switch runtime.GOOS {

10
android/package_ctx.go
View File

@@ -177,16 +177,6 @@ func (p PackageContext) HostBinToolVariable(name, path string) blueprint.Variabl
}) })
} }
// HostJavaBinToolVariable returns a Variable whose value is the path to a host java tool
// in the bin directory for host java targets. It may only be called during a Go
// package's initialization - either from the init() function or as part of a
// package-scoped variable's initialization.
func (p PackageContext) HostJavaBinToolVariable(name, path string) blueprint.Variable {
return p.VariableFunc(name, func(ctx PackageVarContext) string {
return ctx.Config().HostJavaBinToolPath(ctx, path).String()
})
}
// HostJNIToolVariable returns a Variable whose value is the path to a host tool // HostJNIToolVariable returns a Variable whose value is the path to a host tool
// in the lib directory for host targets. It may only be called during a Go // in the lib directory for host targets. It may only be called during a Go
// package's initialization - either from the init() function or as part of a // package's initialization - either from the init() function or as part of a

4
java/config/config.go
View File

@@ -124,8 +124,8 @@ func init() {
pctx.HostBinToolVariable("Zip2ZipCmd", "zip2zip") pctx.HostBinToolVariable("Zip2ZipCmd", "zip2zip")
pctx.HostBinToolVariable("ZipSyncCmd", "zipsync") pctx.HostBinToolVariable("ZipSyncCmd", "zipsync")
pctx.HostBinToolVariable("ApiCheckCmd", "apicheck") pctx.HostBinToolVariable("ApiCheckCmd", "apicheck")
pctx.HostJavaBinToolVariable("D8Cmd", "d8") pctx.HostBinToolVariable("D8Cmd", "d8")
pctx.HostJavaBinToolVariable("R8Cmd", "r8-compat-proguard") pctx.HostBinToolVariable("R8Cmd", "r8-compat-proguard")
pctx.HostBinToolVariable("HiddenAPICmd", "hiddenapi") pctx.HostBinToolVariable("HiddenAPICmd", "hiddenapi")
pctx.HostBinToolVariable("ExtractApksCmd", "extract_apks") pctx.HostBinToolVariable("ExtractApksCmd", "extract_apks")
pctx.VariableFunc("TurbineJar", func(ctx android.PackageVarContext) string { pctx.VariableFunc("TurbineJar", func(ctx android.PackageVarContext) string {