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

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

Merge "Delete apexBundle#prebuiltFileToDelete." am: f21f25f1

parents d4cb07e3 f21f25f1
Loading
Loading
Loading
Loading
+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
	}