Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0350a2e6 authored by Jiyong Park's avatar Jiyong Park Committed by Automerger Merge Worker
Browse files

Don't remove entries for overriddable modules am: 81aa8a42 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12283450

Change-Id: Ibd6a507924fe761e1f1eaeb154d525753cc84f66
parents 84a8eca4 81aa8a42

apex/apex_test.go

+1 −1
Original line number Diff line number Diff line
@@ -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"`)

}

apex/key.go

+0 −6
Original line number Diff line number Diff line
@@ -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

		}

	})