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

Commit 5af24224 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Copy imported APKs to output filename" into main

parents 921a4659 5780d57a
Loading
Loading
Loading
Loading
+12 −4
Original line number Diff line number Diff line
@@ -335,11 +335,19 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
	// Sign or align the package if package has not been preprocessed

	if proptools.Bool(a.properties.Preprocessed) {
		output := srcApk
		var output android.WritablePath
		if !proptools.Bool(a.properties.Skip_preprocessed_apk_checks) {
			writableOutput := android.PathForModuleOut(ctx, "validated-prebuilt", apkFilename)
			a.validatePreprocessedApk(ctx, srcApk, writableOutput)
			output = writableOutput
			output = android.PathForModuleOut(ctx, "validated-prebuilt", apkFilename)
			a.validatePreprocessedApk(ctx, srcApk, output)
		} 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.certificate = PresignedCertificate