Revert "Make glob output include product name"
This reverts commit 03e50cb4d76a99f439230dacb908da4510f84310.
Reason for revert: I think it broke globbing, see b/294378814
Change-Id: I7e81e8e591278bc2d6b6203b93f128351ca6a241
diff --git a/ui/build/soong.go b/ui/build/soong.go
index 44ce3ad..a4cf7fb 100644
--- a/ui/build/soong.go
+++ b/ui/build/soong.go
@@ -195,13 +195,9 @@
var allArgs []string
allArgs = append(allArgs, pb.specificArgs...)
- globPathName, ok := pb.config.TargetProductOrErr()
- if ok != nil {
- globPathName = pb.name
- }
allArgs = append(allArgs,
- "--globListDir", globPathName,
- "--globFile", pb.config.NamedGlobFile(globPathName))
+ "--globListDir", pb.name,
+ "--globFile", pb.config.NamedGlobFile(pb.name))
allArgs = append(allArgs, commonArgs...)
allArgs = append(allArgs, environmentArgs(pb.config, pb.name)...)