diff options
| author | 2017-10-24 19:17:49 +0000 | |
|---|---|---|
| committer | 2017-10-24 19:17:49 +0000 | |
| commit | 3615dcb30cb1db4e61dea229d70a360b26849475 (patch) | |
| tree | b8666343999a50540512de820d49eccb7a9adde5 /java | |
| parent | d602bc1cda3e72c9415f05e59b194056eed700df (diff) | |
| parent | 0d3f8c0db6c86904cc15c1b9e52f3732f81827f3 (diff) | |
Merge "Use prebuilt dx for PDK builds"
Diffstat (limited to 'java')
| -rw-r--r-- | java/config/config.go | 2 |
1 files changed, 1 insertions, 1 deletions
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) |