Merge "Use OutputFilesProvider on aconfig_declarations_group" into main (8f3fd0a0) · Commits · e / os / android_build_soong

aconfig/aconfig_declarations.go

+0 −16

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		package aconfig

		import (
		"fmt"
		"strings"

		"android/soong/android"
		@@ -44,8 +43,6 @@ type DeclarationsModule struct {
		// The flags will only be repackaged if this prop is true.
		Exportable bool
		}

		intermediatePath android.WritablePath
		}

		func DeclarationsFactory() android.Module {
		@@ -86,18 +83,6 @@ func (module *DeclarationsModule) DepsMutator(ctx android.BottomUpMutatorContext
		}
		}

		func (module *DeclarationsModule) OutputFiles(tag string) (android.Paths, error) {
		switch tag {
		case "":
		// The default output of this module is the intermediates format, which is
		// not installable and in a private format that no other rules can handle
		// correctly.
		return []android.Path{module.intermediatePath}, nil
		default:
		return nil, fmt.Errorf("unsupported aconfig_declarations module reference tag %q", tag)
		}
		}

		func joinAndPrefix(prefix string, values []string) string {
		var sb strings.Builder
		for _, v := range values {
		@@ -171,5 +156,4 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module
		IntermediateCacheOutputPath: intermediateCacheFilePath,
		IntermediateDumpOutputPath: intermediateDumpFilePath,
		})

		}

+0 −15

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		package build_flags

		import (
		"fmt"
		"strings"

		"android/soong/android"
		@@ -39,8 +38,6 @@ type DeclarationsModule struct {
		// aconfig files, relative to this Android.bp file
		Srcs []string `android:"path"`
		}

		intermediatePath android.WritablePath
		}

		func DeclarationsFactory() android.Module {
		@@ -53,18 +50,6 @@ func DeclarationsFactory() android.Module {
		return module
		}

		func (module *DeclarationsModule) OutputFiles(tag string) (android.Paths, error) {
		switch tag {
		case "":
		// The default output of this module is the intermediates format, which is
		// not installable and in a private format that no other rules can handle
		// correctly.
		return []android.Path{module.intermediatePath}, nil
		default:
		return nil, fmt.Errorf("unsupported build_flags_declarations module reference tag %q", tag)
		}
		}

		func joinAndPrefix(prefix string, values []string) string {
		var sb strings.Builder
		for _, v := range values {

+2 −13

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		package codegen

		import (
		"fmt"
		"maps"

		"android/soong/android"
		@@ -115,19 +114,9 @@ func (adg *AconfigDeclarationsGroup) GenerateAndroidBuildActions(ctx android.Mod
		Srcjars: adg.javaSrcjars,
		ModeInfos: adg.modeInfos,
		})
		}

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

		func (adg *AconfigDeclarationsGroup) OutputFiles(tag string) (android.Paths, error) {
		switch tag {
		case "":
		return adg.intermediateCacheOutputPaths, nil
		case ".srcjars":
		return adg.javaSrcjars, nil
		default:
		return nil, fmt.Errorf("unsupported module reference tag %s", tag)
		}
		ctx.SetOutputFiles(adg.intermediateCacheOutputPaths, "")
		ctx.SetOutputFiles(adg.javaSrcjars, ".srcjars")
		}

		func (adg *AconfigDeclarationsGroup) Srcjars() android.Paths {