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

Commit c487ae15 authored by Jiyong Park's avatar Jiyong Park Committed by Gerrit Code Review
Browse files

Merge "Don't remove entries for overriddable modules"

parents a5d1fab1 03a7f3ef

apex/apex_test.go

+1 −1
Original line number Diff line number Diff line
@@ -5393,7 +5393,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 TestAllowedFiles(t *testing.T) {

apex/key.go

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

		}

	})