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

Commit f58305a6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents fc14a138 ac5e79f9

apex/apex_test.go

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

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

		}

	})