From 281bc00bbf6e8a363f80350614124cf91e5e7b0e Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 25 Nov 2020 22:57:23 +0000 Subject: [PATCH] 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 --- apex/androidmk.go | 1 - apex/apex.go | 3 --- 2 files changed, 4 deletions(-) diff --git a/apex/androidmk.go b/apex/androidmk.go index fe89b73cc..da38c2ac8 100644 --- a/apex/androidmk.go +++ b/apex/androidmk.go @@ -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 diff --git a/apex/apex.go b/apex/apex.go index ffc29b7ab..df639328e 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -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() {