diff options
| author | 2022-09-14 12:45:42 -0700 | |
|---|---|---|
| committer | 2022-09-14 12:48:17 -0700 | |
| commit | bc2c8a7517f0265618eda4c780df7fc529e09315 (patch) | |
| tree | eb9351007a299998c1777b0f1c354d2d6516605b /java/rro.go | |
| parent | a73e67250365cbcd6af5b3a37e94ce144bc18297 (diff) | |
Move AllowMissingDependencies handling into processMainCert
I046d75dbbd4f21f4a2b6851f558e430e9879fcff fixed android_app modules
with missing certificate dependencies when AllowMissingDependencies
was set, but the same problem can occur in android_app_import and
android_rro modules. Move the AllowMissingDependencies handling
into processMainCert so that it applies to all of them.
Bug: 246649647
Test: TestAppImportMissingCertificateAllowMissingDependencies
Change-Id: Ic7dd3e61e0e3af15c53b583cf680b1e52394a018
Diffstat (limited to 'java/rro.go')
| -rw-r--r-- | java/rro.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/rro.go b/java/rro.go index c12e748c6..3a92b0cf2 100644 --- a/java/rro.go +++ b/java/rro.go @@ -146,7 +146,7 @@ func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleC // Sign the built package _, _, certificates := collectAppDeps(ctx, r, false, false) - certificates = processMainCert(r.ModuleBase, String(r.properties.Certificate), certificates, ctx) + r.certificate, certificates = processMainCert(r.ModuleBase, String(r.properties.Certificate), certificates, ctx) signed := android.PathForModuleOut(ctx, "signed", r.Name()+".apk") var lineageFile android.Path if lineage := String(r.properties.Lineage); lineage != "" { @@ -156,7 +156,6 @@ func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleC rotationMinSdkVersion := String(r.properties.RotationMinSdkVersion) SignAppPackage(ctx, signed, r.aapt.exportPackage, certificates, nil, lineageFile, rotationMinSdkVersion) - r.certificate = certificates[0] r.outputFile = signed partition := rroPartition(ctx) |