Merge branch 'lineage-23.1' of https://github.com/LineageOS/android_build_soong into HEADw16.1

* 'lineage-23.1' of https://github.com/LineageOS/android_build_soong: (528 commits)
  Revert "install_symlink: Make symlink target configurable"
  Reapply "Clear as much of cc.Module as possible after GenerateBuildActions"
  Revert "rust: config: Fix missing CPU variant LD flags in Rust"
  Rename build-flag in outdir
  Revert^4 "cipd: Default CIPD proxy server to on, add opt-out"
  Convert check-vintf-all to phony with actions
  Create a partial implementation of check-vintf-all for soong-only
  Configure RBE rust pool based on build variant
  Revert^3 "Add sdk version check to arr"
  Add jdk.internal.invoke to the allowlist
  Make droid always depend on symbols zip
  Import Device and Odm skus
  Don't install gob_gen in Soong
  Remove bazel reference from run_integration_tests.sh
  Fix bootstrap_test.sh
  Don't panic in aconfig libraries when AllowMissingDependencies is set
  Avoid returning nil paths from PathForModuleSrc
  Revert "Flag controled clang version"
  Rework module target dependencies on required deps
  Revert^2 "Add sdk version check to arr"
  ...

Change-Id: I6e9a63fa14fda917a42e426e5dcebbad7f67e1de

1 files changed, 11 insertions, 22 deletions

diff --git a/android/module_info_json.go b/android/module_info_json.go
index 50c961abe..661264bcd 100644
--- a/android/module_info_json.go
+++ b/android/module_info_json.go
@@ -6,9 +6,11 @@ import (
 	"slices"
 
 	"github.com/google/blueprint"
-	"github.com/google/blueprint/gobtools"
 )
 
+//go:generate go run ../../blueprint/gobtools/codegen/gob_gen.go
+
+// @auto-generate: gob
 type CoreModuleInfoJSON struct {
 	RegisterName       string   `json:"-"`
 	Path               []string `json:"path,omitempty"`                // $(sort $(ALL_MODULES.$(m).PATH))
@@ -21,6 +23,7 @@ type CoreModuleInfoJSON struct {
 	Required           []string `json:"required,omitempty"`            // $(sort $(ALL_MODULES.$(m).REQUIRED_FROM_TARGET))
 }
 
+// @auto-generate: gob
 type ExtraModuleInfoJSON struct {
 	SubName             string   `json:"-"`
 	Uninstallable       bool     `json:"-"`
@@ -53,6 +56,7 @@ type ExtraModuleInfoJSON struct {
 	ModuleNameOverride        string   `json:"-"`
 }
 
+// @auto-generate: gob
 type ModuleInfoJSON struct {
 	core CoreModuleInfoJSON
 	ExtraModuleInfoJSON
@@ -115,26 +119,6 @@ func encodeModuleInfoJSON(w io.Writer, moduleInfoJSON *ModuleInfoJSON) error {
 	return encoder.Encode(combinedModuleInfoJSON{&moduleInfoJSONCopy.core, &moduleInfoJSONCopy.ExtraModuleInfoJSON})
 }
 
-func (p *ModuleInfoJSON) ToGob() *combinedModuleInfoJSON {
-	return &combinedModuleInfoJSON{
-		CoreModuleInfoJSON:  &p.core,
-		ExtraModuleInfoJSON: &p.ExtraModuleInfoJSON,
-	}
-}
-
-func (p *ModuleInfoJSON) FromGob(data *combinedModuleInfoJSON) {
-	p.core = *data.CoreModuleInfoJSON
-	p.ExtraModuleInfoJSON = *data.ExtraModuleInfoJSON
-}
-
-func (m *ModuleInfoJSON) GobEncode() ([]byte, error) {
-	return gobtools.CustomGobEncode[combinedModuleInfoJSON](m)
-}
-
-func (m *ModuleInfoJSON) GobDecode(data []byte) error {
-	return gobtools.CustomGobDecode[combinedModuleInfoJSON](data, m)
-}
-
 func (m *ModuleInfoJSON) GetInstalled() []string {
 	return m.core.Installed
 }
@@ -143,4 +127,9 @@ func (m *ModuleInfoJSON) GetClass() []string {
 	return m.Class
 }
 
-var ModuleInfoJSONProvider = blueprint.NewProvider[[]*ModuleInfoJSON]()
+// @auto-generate: gob
+type ModuleInfoJSONInfo struct {
+	Data []*ModuleInfoJSON
+}
+
+var ModuleInfoJSONProvider = blueprint.NewProvider[ModuleInfoJSONInfo]()