diff options
| author | 2020-06-18 19:34:42 +0900 | |
|---|---|---|
| committer | 2020-06-19 13:29:16 +0900 | |
| commit | 03a7f3efedf47d5bf36f0842e874d7567de03ae1 (patch) | |
| tree | 1dc666332729a74e20a1412b326aad82e4b7ec03 /apex/apex_test.go | |
| parent | 000aef69b547b20553ac779d1bc8726af4b5c1d9 (diff) | |
Don't remove entries for overriddable modules
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 ac5e79f9009400d1020bf45f30c3864bde163b76)
Change-Id: I85d0c756f862323bae556bf657d66ec50038985f
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 7159a4593..eef6f4282 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -5234,7 +5234,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) { |