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

Merge "Copy imported APKs to output filename" into main am: 5af242249d am: 84d32c5b1c

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

Change-Id: I4d1d9f10003b565b70f6023d28c747f45cef129d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-11 06:06:24 +00:00
committed by Automerger Merge Worker
parent 727f6ce321 84d32c5b1c
commit b4a858d7a0
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/app_import.go
View File

@@ -335,11 +335,19 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
// Sign or align the package if package has not been preprocessed // Sign or align the package if package has not been preprocessed
if proptools.Bool(a.properties.Preprocessed) { if proptools.Bool(a.properties.Preprocessed) {
output := srcApk var output android.WritablePath
if !proptools.Bool(a.properties.Skip_preprocessed_apk_checks) { if !proptools.Bool(a.properties.Skip_preprocessed_apk_checks) {
writableOutput := android.PathForModuleOut(ctx, "validated-prebuilt", apkFilename) output = android.PathForModuleOut(ctx, "validated-prebuilt", apkFilename)
a.validatePreprocessedApk(ctx, srcApk, writableOutput) a.validatePreprocessedApk(ctx, srcApk, output)
output = writableOutput } else {
// If using the input APK unmodified, still make a copy of it so that the output filename has the
// right basename.
output = android.PathForModuleOut(ctx, apkFilename)
ctx.Build(pctx, android.BuildParams{
Rule: android.Cp,
Input: srcApk,
Output: output,
})
} }
a.outputFile = output a.outputFile = output
a.certificate = PresignedCertificate a.certificate = PresignedCertificate