|
@@ -80,14 +80,18 @@ func init() {
|
|
|
pctx.HostBinToolVariable("SoongZipCmd", "soong_zip")
|
|
|
pctx.HostBinToolVariable("MergeZipsCmd", "merge_zips")
|
|
|
pctx.VariableFunc("DxCmd", func(config interface{}) (string, error) {
|
|
|
- dexer := "d8"
|
|
|
if config.(android.Config).IsEnvFalse("USE_D8") {
|
|
|
- dexer = "dx"
|
|
|
- }
|
|
|
- if config.(android.Config).UnbundledBuild() || config.(android.Config).IsPdkBuild() {
|
|
|
- return "prebuilts/build-tools/common/bin/" + dexer, nil
|
|
|
+ if config.(android.Config).UnbundledBuild() || config.(android.Config).IsPdkBuild() {
|
|
|
+ return "prebuilts/build-tools/common/bin/dx", nil
|
|
|
+ } else {
|
|
|
+ path, err := pctx.HostBinToolPath(config, "dx")
|
|
|
+ if err != nil {
|
|
|
+ return "", err
|
|
|
+ }
|
|
|
+ return path.String(), nil
|
|
|
+ }
|
|
|
} else {
|
|
|
- path, err := pctx.HostBinToolPath(config, dexer)
|
|
|
+ path, err := pctx.HostBinToolPath(config, "d8-compat-dx")
|
|
|
if err != nil {
|
|
|
return "", err
|
|
|
}
|