Merge "Add framework for using provider on AndroidMKEntries" into main (6ad2e30d) · Commits · e / os / android_build_soong

android/aconfig_providers.go

+14 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,20 @@ func aconfigUpdateAndroidMkEntries(ctx fillInEntriesContext, mod Module, entries
		}
		}

		func aconfigUpdateAndroidMkInfos(ctx fillInEntriesContext, mod Module, infos *AndroidMkProviderInfo) {
		info, ok := OtherModuleProvider(ctx, mod, AconfigPropagatingProviderKey)
		if !ok \|\| len(info.AconfigFiles) == 0 {
		return
		}
		// All of the files in the module potentially depend on the aconfig flag values.
		infos.PrimaryInfo.AddPaths("LOCAL_ACONFIG_FILES", getAconfigFilePaths(mod.base(), info.AconfigFiles))
		if len(infos.ExtraInfo) > 0 {
		for _, ei := range (*infos).ExtraInfo {
		ei.AddPaths("LOCAL_ACONFIG_FILES", getAconfigFilePaths(mod.base(), info.AconfigFiles))
		}
		}
		}

		func mergeAconfigFiles(ctx ModuleContext, container string, inputs Paths, generateRule bool) Paths {
		inputs = SortedUniquePaths(inputs)
		if len(inputs) == 1 {

+576 −9

File changed.

Preview size limit exceeded, changes collapsed.

+11 −13

Original line number	Diff line number	Diff line
		@@ -213,6 +213,7 @@ func (v *vbmeta) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		ctx.InstallFile(v.installDir, v.installFileName(), v.output)

		ctx.SetOutputFiles([]android.Path{v.output}, "")
		android.SetProvider(ctx, android.AndroidMkInfoProvider, v.prepareAndroidMKProviderInfo())
		}

		// Returns the embedded shell command that prints the rollback index
		@@ -265,20 +266,17 @@ func (v *vbmeta) extractPublicKeys(ctx android.ModuleContext) map[string]android
		return result
		}

		var _ android.AndroidMkEntriesProvider = (*vbmeta)(nil)

		// Implements android.AndroidMkEntriesProvider
		func (v *vbmeta) AndroidMkEntries() []android.AndroidMkEntries {
		return []android.AndroidMkEntries{android.AndroidMkEntries{
		func (v vbmeta) prepareAndroidMKProviderInfo() android.AndroidMkProviderInfo {
		providerData := android.AndroidMkProviderInfo{
		PrimaryInfo: android.AndroidMkInfo{
		Class: "ETC",
		OutputFile: android.OptionalPathForPath(v.output),
		ExtraEntries: []android.AndroidMkExtraEntriesFunc{
		func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
		entries.SetString("LOCAL_MODULE_PATH", v.installDir.String())
		entries.SetString("LOCAL_INSTALLED_MODULE_STEM", v.installFileName())
		},
		EntryMap: make(map[string][]string),
		},
		}}
		}
		providerData.PrimaryInfo.SetString("LOCAL_MODULE_PATH", v.installDir.String())
		providerData.PrimaryInfo.SetString("LOCAL_INSTALLED_MODULE_STEM", v.installFileName())
		return &providerData
		}

		var _ Filesystem = (*vbmeta)(nil)