openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: a39899edb9

Change-Id: I78a9725262ae5c46dea73e30a3760b150bf22189
This commit is contained in:
Alan Leung 2017-11-06 18:58:14 +00:00 committed by android-build-merger
parent 009851da32 a39899edb9
commit e5e233c32c
2 changed files with 11 additions and 6 deletions
Show Stats 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("SoongZipCmd", "soong_zip")
pctx.HostBinToolVariable("MergeZipsCmd", "merge_zips") pctx.HostBinToolVariable("MergeZipsCmd", "merge_zips")
pctx.VariableFunc("DxCmd", func(config interface{}) (string, error) { pctx.VariableFunc("DxCmd", func(config interface{}) (string, error) {
dexer := "d8"
if config.(android.Config).IsEnvFalse("USE_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/dx", nil
if config.(android.Config).UnbundledBuild() || config.(android.Config).IsPdkBuild() { } else {
return "prebuilts/build-tools/common/bin/" + dexer, nil path, err := pctx.HostBinToolPath(config, "dx")
if err != nil {
return "", err
}
return path.String(), nil
}
} else { } else {
path, err := pctx.HostBinToolPath(config, dexer) path, err := pctx.HostBinToolPath(config, "d8-compat-dx")
if err != nil { if err != nil {
return "", err return "", err
} }

1
root.bp
View File

@ -29,6 +29,7 @@ optional_subdirs = [
"packages/apps/*", "packages/apps/*",
"prebuilts/clang/host/linux-x86", "prebuilts/clang/host/linux-x86",
"prebuilts/ndk", "prebuilts/ndk",
"prebuilts/r8",
"prebuilts/sdk", "prebuilts/sdk",
"prebuilts/misc", "prebuilts/misc",
"system/*", "system/*",