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

Commit e732271c authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge "apexer: remove --do_not_check_keyname"

parents a9242e32 dc6f9c74

apex/apex_test.go

+0 −2
Original line number Diff line number Diff line
@@ -4138,8 +4138,6 @@ func TestApexName(t *testing.T) { 
	module := ctx.ModuleForTests("myapex", "android_common_com.android.myapex_image")

	apexManifestRule := module.Rule("apexManifestRule")

	ensureContains(t, apexManifestRule.Args["opt"], "-v name com.android.myapex")

	apexRule := module.Rule("apexRule")

	ensureContains(t, apexRule.Args["opt_flags"], "--do_not_check_keyname")



	apexBundle := module.Module().(*apexBundle)

	data := android.AndroidMkDataForTest(t, ctx, apexBundle)

apex/builder.go

+0 −6
Original line number Diff line number Diff line
@@ -706,12 +706,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
			optFlags = append(optFlags, "--unsigned_payload")

		}



		if a.properties.Apex_name != nil {

			// If apex_name is set, apexer can skip checking if key name matches with

			// apex name.  Note that apex_manifest is also mended.

			optFlags = append(optFlags, "--do_not_check_keyname")

		}



		if moduleMinSdkVersion == android.SdkVersion_Android10 {

			implicitInputs = append(implicitInputs, a.manifestJsonOut)

			optFlags = append(optFlags, "--manifest_json "+a.manifestJsonOut.String())