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

Commit 281bc00b authored Nov 25, 2020 by Paul Duffin

Remove redundant setting of DistFiles by apexBundle

A previous change handles dist properties automatically for all module
types and as a result has made the apexBundle setting of DistFiles
redundant so this change removes that.

Test: m nothing
      m dist sdk - before and after this change, compare result to
      make sure that there are no significant differences.
      Test the effect on the apex by following instructions in
      http://b/172951145
Bug: 174226317
Change-Id: If6f741b5b73b3335f4c478a6528f5f311cd633e4

parent 62068051

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() {