From 0f6fdf5544046f99eb923f0e974b3fdd8f10ca1a Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Mon, 6 Apr 2020 18:48:22 +0100 Subject: [PATCH] Fix dex-location for host. Fix the location for non-default build output path. Test: Run host test on golem. Change-Id: Idbaccfc69196fc0b17a849b4a0c7a54d75fd363d --- java/dexpreopt_config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) }