Merge "Don't remove entries for overriddable modules"
This commit is contained in:
commit
c487ae15ba
2 changed files with 1 additions and 7 deletions
|
@ -5393,7 +5393,7 @@ func TestApexKeysTxt(t *testing.T) {
|
|||
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" partition="system"`)
|
||||
ensureNotContains(t, content, "myapex.apex")
|
||||
ensureContains(t, content, `name="myapex.apex" public_key="PRESIGNED" private_key="PRESIGNED" container_certificate="PRESIGNED" container_private_key="PRESIGNED" partition="system"`)
|
||||
}
|
||||
|
||||
func TestAllowedFiles(t *testing.T) {
|
||||
|
|
|
@ -160,12 +160,6 @@ func (s *apexKeysText) GenerateBuildActions(ctx android.SingletonContext) {
|
|||
presigned: true,
|
||||
partition: m.PartitionTag(ctx.DeviceConfig()),
|
||||
}
|
||||
|
||||
for _, om := range m.Overrides() {
|
||||
if _, ok := apexKeyMap[om]; ok {
|
||||
delete(apexKeyMap, om)
|
||||
}
|
||||
}
|
||||
apexKeyMap[m.BaseModuleName()] = entry
|
||||
}
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue