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

Commit 410b20db authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Notice files for prebuilt_etc are included in APEX" am: 4f35976c 

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

Change-Id: Ifbfd71ff4416b07742e70c9d9aba523d60af1d2b
parents fbd73724 4f35976c

apex/apex.go

+3 −0
Original line number Diff line number Diff line
@@ -1291,6 +1291,8 @@ type apexFile struct { 
	overriddenPackageName   string           // only for apps



	isJniLib bool



	noticeFiles android.Paths

}



func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, androidMkModuleName string, installDir string, class apexFileClass, module android.Module) apexFile {
@@ -1306,6 +1308,7 @@ func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, androidM 
		ret.requiredModuleNames = module.RequiredModuleNames()

		ret.targetRequiredModuleNames = module.TargetRequiredModuleNames()

		ret.hostRequiredModuleNames = module.HostRequiredModuleNames()

		ret.noticeFiles = module.NoticeFiles()

	}

	return ret

}

apex/builder.go

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

	})



	for _, fi := range a.filesInfo {

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

	}



	if len(noticeFiles) == 0 {

		return android.NoticeOutputs{}

	}