Merge "Harcode partition info of apk-in-apex for apkcerts.txt" into main
diff --git a/filesystem/android_device.go b/filesystem/android_device.go
index 7387c8a..6b8af74 100644
--- a/filesystem/android_device.go
+++ b/filesystem/android_device.go
@@ -942,7 +942,9 @@
apkCerts = append(apkCerts, formatLine(info.Certificate, info.InstallApkName+".apk", partition))
} else if info, ok := android.OtherModuleProvider(ctx, installedModule, java.AppInfosProvider); ok {
for _, certInfo := range info {
- apkCerts = append(apkCerts, formatLine(certInfo.Certificate, certInfo.InstallApkName+".apk", partition))
+ // Partition information of apk-in-apex is not exported to the legacy Make packaging system.
+ // Hardcode the partition to "system"
+ apkCerts = append(apkCerts, formatLine(certInfo.Certificate, certInfo.InstallApkName+".apk", "system"))
}
} else if info, ok := android.OtherModuleProvider(ctx, installedModule, java.RuntimeResourceOverlayInfoProvider); ok {
apkCerts = append(apkCerts, formatLine(info.Certificate, info.OutputFile.Base(), partition))