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

Commit 70cbebf3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Delete apexBundle#prebuiltFileToDelete." am: f21f25f1 am: ab97575c 

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



Change-Id: Ia43c0776cf5b4155643ee66be942db569a09780e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6cd88c3b ab97575c

apex/apex.go

+0 −8
Original line number Diff line number Diff line
@@ -492,8 +492,6 @@ type apexBundle struct { 
	// Optional list of lint report zip files for apexes that contain java or app modules

	lintReports android.Paths



	prebuiltFileToDelete string



	isCompressed bool



	// Path of API coverage generate file
@@ -2344,12 +2342,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
			} else {

				ctx.ModuleErrorf("certificate dependency %q must be an android_app_certificate module", depName)

			}

		case android.PrebuiltDepTag:

			// If the prebuilt is force disabled, remember to delete the prebuilt file

			// that might have been installed in the previous builds

			if prebuilt, ok := child.(prebuilt); ok && prebuilt.isForceDisabled() {

				a.prebuiltFileToDelete = prebuilt.InstallFilename()

			}

		}

		return false

	}