diff --git a/apex/apex_test.go b/apex/apex_test.go index 08011fd5e..406ade889 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -1363,5 +1363,5 @@ 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"`) - 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 ec28134cc..ec33763dd 100644 --- a/apex/key.go +++ b/apex/key.go @@ -161,12 +161,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 } })