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

Don't remove entries for overriddable modules

Browse Source 
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
Test: m
Merged-In: I85d0c756f862323bae556bf657d66ec50038985f
(cherry picked from commit ac5e79f900)
Change-Id: I85d0c756f862323bae556bf657d66ec50038985f
This commit is contained in:
Jiyong Park
2020-06-18 19:34:42 +09:00
parent 000aef69b5
commit 03a7f3efed
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

@@ -5234,7 +5234,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) {

6
apex/key.go
View File

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