Always use installed version of d8-compat-dx
Also adapt to the renaming of d8 to d8-compat-dx.
Test: USE_D8=true m -j16 PRODUCT-aosp_arm64-eng showcommands core-oj
Change-Id: Ic7aaa6a5da34a6a5706c20f53922a83cb1de1100
diff --git a/java/config/config.go b/java/config/config.go
index c19a705..654d935 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -80,14 +80,18 @@
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
}
diff --git a/root.bp b/root.bp
index 6788fa7..bc59171 100644
--- a/root.bp
+++ b/root.bp
@@ -29,6 +29,7 @@
"packages/apps/*",
"prebuilts/clang/host/linux-x86",
"prebuilts/ndk",
+ "prebuilts/r8",
"prebuilts/sdk",
"prebuilts/misc",
"system/*",