diff --git a/android/config.go b/android/config.go index dca998f5a..d83bf0a9e 100644 --- a/android/config.go +++ b/android/config.go @@ -496,6 +496,10 @@ func (c *config) UnbundledBuild() bool { return Bool(c.ProductVariables.Unbundled_build) } +func (c *config) IsPdkBuild() bool { + return Bool(c.ProductVariables.Pdk) +} + func (c *config) DevicePrefer32BitExecutables() bool { return Bool(c.ProductVariables.DevicePrefer32BitExecutables) } diff --git a/java/config/config.go b/java/config/config.go index 6509d80ae..94dfa19f1 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -83,7 +83,7 @@ func init() { if config.(android.Config).Getenv("USE_D8") == "true" { dexer = "d8" } - if config.(android.Config).UnbundledBuild() { + if config.(android.Config).UnbundledBuild() || config.(android.Config).IsPdkBuild() { return "prebuilts/build-tools/common/bin/" + dexer, nil } else { path, err := pctx.HostBinToolPath(config, dexer)