StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't remove entries for overriddable modules" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-19 13:59:00 +00:00
committed by Android (Google) Code Review
parent fc14a1383b ac5e79f900
commit f58305a6a4
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex_test.go
View File

@@ -4988,7 +4988,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 TestMain(m *testing.M) {

6
apex/key.go
View File

@@ -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
}
})