Merge "apexer: remove --do_not_check_keyname"
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 31e848e..4f300e7 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -4138,8 +4138,6 @@
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)
diff --git a/apex/builder.go b/apex/builder.go
index 4331d3e..4aef3c1 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -706,12 +706,6 @@
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())