Handle prebuilt module types in allInstalledModules
Owner in PackagingSpec uses ModuleName, while allInstalledModules uses
mod.Name(). For prebuilt modules without any sources (e.g.
com.android.apex.cts.shim.v1_prebuilt), the former does not contain
prebuilt_, but the latter does contain it. This was causing such modules
to be skipped in the results of allInstalledModules.
This CL fixes it by using ctx.OtherModuleName
Test: verified that com.android.apex.cts.shim.v1_prebuilt is returned by
allInstalledModules of aosp_cf_x86_64_phone
Change-Id: Id87e8cf782a94c48245385c1837960eee803c619
diff --git a/filesystem/android_device.go b/filesystem/android_device.go
index 178c716..31678aa 100644
--- a/filesystem/android_device.go
+++ b/filesystem/android_device.go
@@ -279,7 +279,7 @@
ret := []android.Module{}
ctx.WalkDepsProxy(func(mod, _ android.ModuleProxy) bool {
- if variations, ok := allOwners[mod.Name()]; ok && android.InList(ctx.OtherModuleSubDir(mod), variations) {
+ if variations, ok := allOwners[ctx.OtherModuleName(mod)]; ok && android.InList(ctx.OtherModuleSubDir(mod), variations) {
ret = append(ret, mod)
}
return true