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

Commit 11402caa authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Remove redundant setting of DistFiles by apexBundle"

parents a67ff601 281bc00b

apex/androidmk.go

+0 −1
Original line number Diff line number Diff line
@@ -334,7 +334,6 @@ func (a *apexBundle) writeRequiredModules(w io.Writer) { 


func (a *apexBundle) androidMkForType() android.AndroidMkData {

	return android.AndroidMkData{

		DistFiles: a.distFiles,

		Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {

			moduleNames := []string{}

			apexType := a.properties.ApexType

apex/apex.go

+0 −3
Original line number Diff line number Diff line
@@ -349,8 +349,6 @@ type apexBundle struct { 
	lintReports android.Paths



	prebuiltFileToDelete string



	distFiles android.TaggedDistFiles

}



// apexFileClass represents a type of file that can be included in APEX.
@@ -1799,7 +1797,6 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	}

	a.buildApexDependencyInfo(ctx)

	a.buildLintReports(ctx)

	a.distFiles = a.GenerateTaggedDistFiles(ctx)



	// Append meta-files to the filesInfo list so that they are reflected in Android.mk as well.

	if a.installable() {