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

Merge "Always use installed version of d8-compat-dx"

Browse Source
This commit is contained in:
Alan Leung
2017-11-06 18:54:53 +00:00
committed by Gerrit Code Review
parent 5d37417347 2e19cd8959
commit a39899edb9
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/config/config.go
View File

@@ -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
}