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

Commit b6241d46 authored by Jiyong Park's avatar Jiyong Park
Browse files

Notice files for prebuilt_etc are included in APEX 

This change fixes a bug that notice files for some module type (e.g.
prebuilt_etc) were not included in APEX. This happened because we relied
on WalkPayloadDeps which actually doesn't traverse module types that
don't implement ApexModule interface. prebuilt_etc is one such module
type. Fixing the problem by also iterating the filesInfo array which
has info about all modules that are included in the APEX.

Bug: 166575301
Test: m com.android.tzdata and inspect the built artifact.
NOTICE.html.gz is there.

Merged-In: Iceb055b60184aef2a3e65e44680304853eb79a53
Change-Id: Iceb055b60184aef2a3e65e44680304853eb79a53
(cherry picked from commit 41f637d6)
parent 6a470084

apex/apex.go

+3 −0
Original line number Diff line number Diff line
@@ -1273,6 +1273,8 @@ type apexFile struct { 
	lintDepSets             java.LintDepSets // only for javalibs and apps

	certificate             java.Certificate // only for apps

	overriddenPackageName   string           // only for apps



	noticeFile android.OptionalPath

}



func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, moduleName string, installDir string, class apexFileClass, module android.Module) apexFile {
@@ -1288,6 +1290,7 @@ func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, moduleNa 
		ret.requiredModuleNames = module.RequiredModuleNames()

		ret.targetRequiredModuleNames = module.TargetRequiredModuleNames()

		ret.hostRequiredModuleNames = module.HostRequiredModuleNames()

		ret.noticeFile = module.NoticeFile()

	}

	return ret

}

apex/builder.go

+6 −0
Original line number Diff line number Diff line
@@ -237,6 +237,12 @@ func (a *apexBundle) buildNoticeFiles(ctx android.ModuleContext, apexFileName st 
		return true

	})



	for _, fi := range a.filesInfo {

		if fi.noticeFile.Valid() {

			noticeFiles = append(noticeFiles, fi.noticeFile.Path())

		}

	}



	if len(noticeFiles) == 0 {

		return android.NoticeOutputs{}

	}