Merge "Fix dex-location for host." am: c7b02cb523 am: 178c0807e7

Change-Id: If6924cf10fd080db1be2691f6fadc4da3693f0c0
This commit is contained in:
David Srbecky
2020-04-06 22:28:40 +00:00
committed by Automerger Merge Worker

View File

@@ -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)
}