StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "apexer: remove --do_not_check_keyname" am: e732271cc5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2421920

Change-Id: Ib4af8a15cce5a4271ae0a1b34301ff4045ddae9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han
2023-02-07 01:58:00 +00:00
committed by Automerger Merge Worker
parent 85cae04fb2 e732271cc5
commit 0695e1dce0
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex_test.go
View File

@@ -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)

6
apex/builder.go
View File

@@ -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())