Don't remove entries for overriddable modules
Previously, when there is apex_set that is overriding another module,
the entry for the overridden module is removed from apexkeys.txt.
However, this is wrong because the existence of the apex_set module
doesn't necessary mean that the module is insatalled instead of the
overridden module. That is determined by PRODUCT_PACKAGES which Soong
has no knowledge of. Therefore, we don't delete the entry for the
overridden (actually possibly overridable) modules in the file.
Bug: 158729168
Bug: 162464887
Test: m
Merged-In: I85d0c756f862323bae556bf657d66ec50038985f
(cherry picked from commit ac5e79f9009400d1020bf45f30c3864bde163b76)
Change-Id: I85d0c756f862323bae556bf657d66ec50038985f
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 08011fd..406ade8 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -1363,5 +1363,5 @@
apexKeysText := ctx.SingletonForTests("apex_keys_text")
content := apexKeysText.MaybeDescription("apexkeys.txt").BuildParams.Args["content"]
ensureContains(t, content, `name="myapex_set.apex" public_key="PRESIGNED" private_key="PRESIGNED" container_certificate="PRESIGNED" container_private_key="PRESIGNED"`)
- ensureNotContains(t, content, "myapex.apex")
+ ensureContains(t, content, `name="myapex.apex" public_key="PRESIGNED" private_key="PRESIGNED" container_certificate="PRESIGNED" container_private_key="PRESIGNED"`)
}
diff --git a/apex/key.go b/apex/key.go
index ec28134..ec33763 100644
--- a/apex/key.go
+++ b/apex/key.go
@@ -161,12 +161,6 @@
presigned: true,
partition: m.PartitionTag(ctx.DeviceConfig()),
}
-
- for _, om := range m.Overrides() {
- if _, ok := apexKeyMap[om]; ok {
- delete(apexKeyMap, om)
- }
- }
apexKeyMap[m.BaseModuleName()] = entry
}
})
