Refactor dexing
Move dexing support into java/dex.go, including the rules and logic
from builder.go and the function from java.go.
Test: no change to build.ninja
Change-Id: I098d2a9774e28079ba44791679a0db6f876fe3e6
diff --git a/java/config/config.go b/java/config/config.go
index c43f9a3..930e65e 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -106,13 +106,9 @@
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() {