Merge "Use OutputFilesProvider on cc_cmake_snapshot" into main am: 26faf1b321

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

Change-Id: Ib129339698ecaa6d0c1c7b6013965e4c3bf42b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zi Wang
2024-06-20 16:31:34 +00:00
committed by Automerger Merge Worker

View File

@@ -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 {