Merge "Fix dex-location for host." am: c7b02cb523
Change-Id: Ic546d67275de50b7f8c2a4a4fb59c3c5c3673e75
This commit is contained in:
@@ -81,7 +81,7 @@ func stemOf(moduleName string) string {
|
|||||||
|
|
||||||
func getDexLocation(ctx android.PathContext, target android.Target, subdir string, name string) string {
|
func getDexLocation(ctx android.PathContext, target android.Target, subdir string, name string) string {
|
||||||
if target.Os.Class == android.Host {
|
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 {
|
} else {
|
||||||
return filepath.Join("/", subdir, name)
|
return filepath.Join("/", subdir, name)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user