summaryrefslogtreecommitdiff
path: root/java/dexpreopt_config.go
diff options
context:
space:
mode:
author David Srbecky <dsrbecky@google.com> 2020-04-06 18:48:22 +0100
committer David Srbecky <dsrbecky@google.com> 2020-04-06 18:48:22 +0100
commit0f6fdf5544046f99eb923f0e974b3fdd8f10ca1a (patch)
treedce48cd8246f857bbddef57f2de35fd36f485043 /java/dexpreopt_config.go
parentdd22225b3ace43f2edc3e522b74180a85a4920d5 (diff)
Fix dex-location for host.
Fix the location for non-default build output path. Test: Run host test on golem. Change-Id: Idbaccfc69196fc0b17a849b4a0c7a54d75fd363d
Diffstat (limited to 'java/dexpreopt_config.go')
-rw-r--r--java/dexpreopt_config.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go
index 1315aba64..066694cc3 100644
--- a/java/dexpreopt_config.go
+++ b/java/dexpreopt_config.go
@@ -81,7 +81,7 @@ func stemOf(moduleName string) string {
func getDexLocation(ctx android.PathContext, target android.Target, subdir string, name string) string {
if target.Os.Class == android.Host {
- return filepath.Join("out", "host", ctx.Config().PrebuiltOS(), subdir, name)
+ return filepath.Join(ctx.Config().Getenv("OUT_DIR"), "host", ctx.Config().PrebuiltOS(), subdir, name)
} else {
return filepath.Join("/", subdir, name)
}