StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use OutputFilesProvider on cc_cmake_snapshot" into main

Browse Source
This commit is contained in:
Zi Wang
2024-06-20 16:18:16 +00:00
committed by Gerrit Code Review
parent 9b3fba9b0b f95cfa6087
commit 26faf1b321
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cc/cmake_snapshot.go
View File

@@ -15,7 +15,6 @@
package cc package cc
import ( import (
"android/soong/android"
"bytes" "bytes"
_ "embed" _ "embed"
"fmt" "fmt"
@@ -25,6 +24,8 @@ import (
"strings" "strings"
"text/template" "text/template"
"android/soong/android"
"github.com/google/blueprint" "github.com/google/blueprint"
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
) )
@@ -462,15 +463,8 @@ func (m *CmakeSnapshot) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// Finish generating the final zip file // Finish generating the final zip file
zipRule.Build(m.zipPath.String(), "archiving "+ctx.ModuleName()) zipRule.Build(m.zipPath.String(), "archiving "+ctx.ModuleName())
}
func (m *CmakeSnapshot) OutputFiles(tag string) (android.Paths, error) { ctx.SetOutputFiles(android.Paths{m.zipPath}, "")
switch tag {
case "":
return android.Paths{m.zipPath}, nil
default:
return nil, fmt.Errorf("unsupported module reference tag %q", tag)
}
} }
func (m *CmakeSnapshot) AndroidMkEntries() []android.AndroidMkEntries { func (m *CmakeSnapshot) AndroidMkEntries() []android.AndroidMkEntries {