Merge "Refactor dexing" am: 10d9930c06 am: a5c0b08f75

am: 4b4a8efd5c Change-Id: I923806b7efcd62ae84b4d015395e7c6bb9490473
2018-01-03 22:14:04 +00:00
parent 4a9861dd1e 4b4a8efd5c
commit 2d00f9ac32
5 changed files with 186 additions and 200 deletions
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -107,13 +107,9 @@ func init() {
 			return path.String(), nil
 		}
 	})
-	pctx.VariableFunc("D8Cmd", func(config android.Config) (string, error) {
-		path, err := pctx.HostBinToolPath(config, "d8")
-		if err != nil {
-			return "", err
-		}
-		return path.String(), nil
-	})
+
+	pctx.HostBinToolVariable("D8Cmd", "d8")
+
 	pctx.VariableFunc("TurbineJar", func(config android.Config) (string, error) {
 		turbine := "turbine.jar"
 		if config.UnbundledBuild() {