tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove redundant setting of DistFiles by apexBundle" am: 11402caa47

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

Change-Id: Ib12f4c17bd41dad2a005a28dd060ebbe1d245f06
This commit is contained in:
Paul Duffin 2020-11-30 13:41:27 +00:00 committed by Automerger Merge Worker
commit ba5ddbd78c
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apex/androidmk.go
View file

@ -334,7 +334,6 @@ func (a *apexBundle) writeRequiredModules(w io.Writer) {
func (a *apexBundle) androidMkForType() android.AndroidMkData { func (a *apexBundle) androidMkForType() android.AndroidMkData {
return android.AndroidMkData{ return android.AndroidMkData{
DistFiles: a.distFiles,
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) { Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
moduleNames := []string{} moduleNames := []string{}
apexType := a.properties.ApexType apexType := a.properties.ApexType

3
apex/apex.go
View file

@ -349,8 +349,6 @@ type apexBundle struct {
lintReports android.Paths lintReports android.Paths
prebuiltFileToDelete string prebuiltFileToDelete string
distFiles android.TaggedDistFiles
} }
// apexFileClass represents a type of file that can be included in APEX. // 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.buildApexDependencyInfo(ctx)
a.buildLintReports(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. // Append meta-files to the filesInfo list so that they are reflected in Android.mk as well.
if a.installable() { if a.installable() {