Merge "Don't remove entries for overriddable modules" into rvc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f58305a6a4
@@ -4988,7 +4988,7 @@ func TestApexKeysTxt(t *testing.T) {
|
|||||||
apexKeysText := ctx.SingletonForTests("apex_keys_text")
|
apexKeysText := ctx.SingletonForTests("apex_keys_text")
|
||||||
content := apexKeysText.MaybeDescription("apexkeys.txt").BuildParams.Args["content"]
|
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"`)
|
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 TestMain(m *testing.M) {
|
func TestMain(m *testing.M) {
|
||||||
|
@@ -160,12 +160,6 @@ func (s *apexKeysText) GenerateBuildActions(ctx android.SingletonContext) {
|
|||||||
presigned: true,
|
presigned: true,
|
||||||
partition: m.PartitionTag(ctx.DeviceConfig()),
|
partition: m.PartitionTag(ctx.DeviceConfig()),
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, om := range m.Overrides() {
|
|
||||||
if _, ok := apexKeyMap[om]; ok {
|
|
||||||
delete(apexKeyMap, om)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
apexKeyMap[m.BaseModuleName()] = entry
|
apexKeyMap[m.BaseModuleName()] = entry
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user