diff --git a/ui/build/config.go b/ui/build/config.go
index bc0ab33d9..c991777f9 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -1124,6 +1124,9 @@ func (c *configImpl) NamedGlobFile(name string) string {
 }
 
 func (c *configImpl) UsedEnvFile(tag string) string {
+	if v, ok := c.environ.Get("TARGET_PRODUCT"); ok {
+		return shared.JoinPath(c.SoongOutDir(), usedEnvFile+"."+v+"."+tag)
+	}
 	return shared.JoinPath(c.SoongOutDir(), usedEnvFile+"."+tag)
 }