Merge "Use OutputFilesProvider on cc_cmake_snapshot" into main (26faf1b3) · Commits · e / os / android_build_soong

cc/cmake_snapshot.go

+3 −9

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

		import (
		"android/soong/android"
		"bytes"
		_ "embed"
		"fmt"
		@@ -25,6 +24,8 @@ import (
		"strings"
		"text/template"

		"android/soong/android"

		"github.com/google/blueprint"
		"github.com/google/blueprint/proptools"
		)
		@@ -462,15 +463,8 @@ func (m *CmakeSnapshot) GenerateAndroidBuildActions(ctx android.ModuleContext) {

		// Finish generating the final zip file
		zipRule.Build(m.zipPath.String(), "archiving "+ctx.ModuleName())
		}

		func (m *CmakeSnapshot) OutputFiles(tag string) (android.Paths, error) {
		switch tag {
		case "":
		return android.Paths{m.zipPath}, nil
		default:
		return nil, fmt.Errorf("unsupported module reference tag %q", tag)
		}
		ctx.SetOutputFiles(android.Paths{m.zipPath}, "")
		}

		func (m *CmakeSnapshot) AndroidMkEntries() []android.AndroidMkEntries {