From c899d7808e0581670b5857984a09d33f24808d58 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 4 Nov 2021 10:25:20 -0700
Subject: [PATCH] Revert "Temporarily add method to get java binary tool"

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
---
 android/config.go      |  8 --------
 android/package_ctx.go | 10 ----------
 java/config/config.go  |  4 ++--
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/android/config.go b/android/config.go
index a07c4c893..4fe2f832d 100644
--- a/android/config.go
+++ b/android/config.go
@@ -599,14 +599,6 @@ func (c *config) HostJavaToolPath(ctx PathContext, tool string) 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.
 func (c *config) PrebuiltOS() string {
 	switch runtime.GOOS {
diff --git a/android/package_ctx.go b/android/package_ctx.go
index abd0c29da..c19debbb4 100644
--- a/android/package_ctx.go
+++ b/android/package_ctx.go
@@ -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
 // 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
diff --git a/java/config/config.go b/java/config/config.go
index 92d49a6cf..30c6f91aa 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -124,8 +124,8 @@ func init() {
 	pctx.HostBinToolVariable("Zip2ZipCmd", "zip2zip")
 	pctx.HostBinToolVariable("ZipSyncCmd", "zipsync")
 	pctx.HostBinToolVariable("ApiCheckCmd", "apicheck")
-	pctx.HostJavaBinToolVariable("D8Cmd", "d8")
-	pctx.HostJavaBinToolVariable("R8Cmd", "r8-compat-proguard")
+	pctx.HostBinToolVariable("D8Cmd", "d8")
+	pctx.HostBinToolVariable("R8Cmd", "r8-compat-proguard")
 	pctx.HostBinToolVariable("HiddenAPICmd", "hiddenapi")
 	pctx.HostBinToolVariable("ExtractApksCmd", "extract_apks")
 	pctx.VariableFunc("TurbineJar", func(ctx android.PackageVarContext) string {