Move some gob helpers to a new package.
Bug: 358427516
Test: CI
Change-Id: Ib25bbfb6e89c35cf4a080e2baaffadabf0e5636e
diff --git a/android/module.go b/android/module.go
index ec0f446..124b066 100644
--- a/android/module.go
+++ b/android/module.go
@@ -16,7 +16,6 @@
import (
"fmt"
- "github.com/google/blueprint/depset"
"net/url"
"path/filepath"
"reflect"
@@ -25,6 +24,8 @@
"strings"
"github.com/google/blueprint"
+ "github.com/google/blueprint/depset"
+ "github.com/google/blueprint/gobtools"
"github.com/google/blueprint/proptools"
)
@@ -2201,11 +2202,11 @@
}
func (k *katiInstall) GobEncode() ([]byte, error) {
- return blueprint.CustomGobEncode[katiInstallGob](k)
+ return gobtools.CustomGobEncode[katiInstallGob](k)
}
func (k *katiInstall) GobDecode(data []byte) error {
- return blueprint.CustomGobDecode[katiInstallGob](data, k)
+ return gobtools.CustomGobDecode[katiInstallGob](data, k)
}
type extraFilesZip struct {
@@ -2231,11 +2232,11 @@
}
func (e *extraFilesZip) GobEncode() ([]byte, error) {
- return blueprint.CustomGobEncode[extraFilesZipGob](e)
+ return gobtools.CustomGobEncode[extraFilesZipGob](e)
}
func (e *extraFilesZip) GobDecode(data []byte) error {
- return blueprint.CustomGobDecode[extraFilesZipGob](data, e)
+ return gobtools.CustomGobDecode[extraFilesZipGob](data, e)
}
type katiInstalls []katiInstall