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

Commit 3125b75d authored by Zi Wang's avatar Zi Wang Committed by Gerrit Code Review
Browse files

Merge "PrebuildEtcModule no longer implements OutputFiles method" into main

parents 658bd054 e2346b87

apex/apex.go

+2 −2
Original line number Diff line number Diff line
@@ -2128,7 +2128,7 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
			}

		case prebuiltTag:

			if prebuilt, ok := child.(prebuilt_etc.PrebuiltEtcModule); ok {

				filesToCopy, _ := prebuilt.OutputFiles("")

				filesToCopy := android.OutputFilesForModule(ctx, prebuilt, "")

				for _, etcFile := range filesToCopy {

					vctx.filesInfo = append(vctx.filesInfo, apexFileForPrebuiltEtc(ctx, prebuilt, etcFile))

				}
@@ -2274,7 +2274,7 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
		// Because APK-in-APEX embeds jni_libs transitively, we don't need to track transitive deps

	} else if java.IsXmlPermissionsFileDepTag(depTag) {

		if prebuilt, ok := child.(prebuilt_etc.PrebuiltEtcModule); ok {

			filesToCopy, _ := prebuilt.OutputFiles("")

			filesToCopy := android.OutputFilesForModule(ctx, prebuilt, "")

			for _, etcFile := range filesToCopy {

				vctx.filesInfo = append(vctx.filesInfo, apexFileForPrebuiltEtc(ctx, prebuilt, etcFile))

			}

cc/llndk_library.go

+4 −7
Original line number Diff line number Diff line
@@ -15,9 +15,10 @@ 
package cc



import (

	"strings"



	"android/soong/android"

	"android/soong/etc"

	"strings"

)



var (
@@ -96,7 +97,6 @@ type llndkLibrariesTxtModule struct { 
}



var _ etc.PrebuiltEtcModule = &llndkLibrariesTxtModule{}

var _ android.OutputFileProducer = &llndkLibrariesTxtModule{}



// llndk_libraries_txt is a singleton module whose content is a list of LLNDK libraries

// generated by Soong but can be referenced by other modules.
@@ -118,6 +118,8 @@ func (txt *llndkLibrariesTxtModule) GenerateAndroidBuildActions(ctx android.Modu 


	installPath := android.PathForModuleInstall(ctx, "etc")

	ctx.InstallFile(installPath, filename, txt.outputFile)



	ctx.SetOutputFiles(android.Paths{txt.outputFile}, "")

}



func (txt *llndkLibrariesTxtModule) GenerateSingletonBuildActions(ctx android.SingletonContext) {
@@ -161,11 +163,6 @@ func (txt *llndkLibrariesTxtModule) MakeVars(ctx android.MakeVarsContext) { 
	ctx.Strict("LLNDK_LIBRARIES", strings.Join(txt.moduleNames, " "))

}



// PrebuiltEtcModule interface

func (txt *llndkLibrariesTxtModule) OutputFile() android.OutputPath {

	return txt.outputFile

}



// PrebuiltEtcModule interface

func (txt *llndkLibrariesTxtModule) BaseDir() string {

	return "etc"

cc/sanitize.go

+2 −6
Original line number Diff line number Diff line
@@ -1798,7 +1798,6 @@ type sanitizerLibrariesTxtModule struct { 
}



var _ etc.PrebuiltEtcModule = (*sanitizerLibrariesTxtModule)(nil)

var _ android.OutputFileProducer = (*sanitizerLibrariesTxtModule)(nil)



func RegisterSanitizerLibrariesTxtType(ctx android.RegistrationContext) {

	ctx.RegisterModuleType("sanitizer_libraries_txt", sanitizerLibrariesTxtFactory)
@@ -1886,6 +1885,8 @@ func (txt *sanitizerLibrariesTxtModule) GenerateAndroidBuildActions(ctx android. 


	installPath := android.PathForModuleInstall(ctx, "etc")

	ctx.InstallFile(installPath, filename, txt.outputFile)



	ctx.SetOutputFiles(android.Paths{txt.outputFile}, "")

}



func (txt *sanitizerLibrariesTxtModule) AndroidMkEntries() []android.AndroidMkEntries {
@@ -1895,11 +1896,6 @@ func (txt *sanitizerLibrariesTxtModule) AndroidMkEntries() []android.AndroidMkEn 
	}}

}



// PrebuiltEtcModule interface

func (txt *sanitizerLibrariesTxtModule) OutputFile() android.OutputPath {

	return txt.outputFile

}



// PrebuiltEtcModule interface

func (txt *sanitizerLibrariesTxtModule) BaseDir() string {

	return "etc"

cc/vndk.go

+2 −6
Original line number Diff line number Diff line
@@ -396,7 +396,6 @@ type VndkLibrariesTxtProperties struct { 
}



var _ etc.PrebuiltEtcModule = &vndkLibrariesTxt{}

var _ android.OutputFileProducer = &vndkLibrariesTxt{}



// vndksp_libraries_txt is a singleton module whose content is a list of VNDKSP libraries

// generated by Soong but can be referenced by other modules.
@@ -455,6 +454,8 @@ func (txt *vndkLibrariesTxt) GenerateAndroidBuildActions(ctx android.ModuleConte 


	installPath := android.PathForModuleInstall(ctx, "etc")

	ctx.InstallFile(installPath, filename, txt.outputFile)



	ctx.SetOutputFiles(android.Paths{txt.outputFile}, "")

}



func (txt *vndkLibrariesTxt) GenerateSingletonBuildActions(ctx android.SingletonContext) {
@@ -496,11 +497,6 @@ func (txt *vndkLibrariesTxt) MakeVars(ctx android.MakeVarsContext) { 
	ctx.Strict(txt.makeVarName, strings.Join(filter(txt.moduleNames, txt.filterOutFromMakeVar), " "))

}



// PrebuiltEtcModule interface

func (txt *vndkLibrariesTxt) OutputFile() android.OutputPath {

	return txt.outputFile

}



// PrebuiltEtcModule interface

func (txt *vndkLibrariesTxt) BaseDir() string {

	return "etc"

etc/prebuilt_etc.go

+0 −4
Original line number Diff line number Diff line
@@ -133,10 +133,6 @@ type PrebuiltEtcModule interface { 


	// Returns the sub install directory relative to BaseDir().

	SubDir() string



	// Returns an android.OutputPath to the intermediate file, which is the renamed prebuilt source

	// file.

	OutputFiles(tag string) (android.Paths, error)

}



type PrebuiltEtc struct {