Merge "Skip writing ninja file for module with a cache hit during incremental build." into main
diff --git a/aconfig/aconfig_declarations.go b/aconfig/aconfig_declarations.go
index 9e3d291..9b638e7 100644
--- a/aconfig/aconfig_declarations.go
+++ b/aconfig/aconfig_declarations.go
@@ -220,15 +220,10 @@
}
func (module *DeclarationsModule) BuildActionProviderKeys() []blueprint.AnyProviderKey {
- return []blueprint.AnyProviderKey{android.AconfigDeclarationsProviderKey}
-}
-
-func (module *DeclarationsModule) PackageContextPath() string {
- return pkgPath
-}
-
-func (module *DeclarationsModule) CachedRules() []blueprint.Rule {
- return []blueprint.Rule{aconfigRule, aconfigTextRule}
+ return []blueprint.AnyProviderKey{
+ android.AconfigDeclarationsProviderKey,
+ android.AconfigReleaseDeclarationsProviderKey,
+ }
}
var _ blueprint.Incremental = &DeclarationsModule{}
diff --git a/aconfig/init.go b/aconfig/init.go
index de155ab..5fa7e76 100644
--- a/aconfig/init.go
+++ b/aconfig/init.go
@@ -23,8 +23,7 @@
)
var (
- pkgPath = "android/soong/aconfig"
- pctx = android.NewPackageContext(pkgPath)
+ pctx = android.NewPackageContext("android/soong/aconfig")
// For aconfig_declarations: Generate cache file
aconfigRule = pctx.AndroidStaticRule("aconfig",
@@ -111,6 +110,7 @@
pctx.HostBinToolVariable("soong_zip", "soong_zip")
gob.Register(android.AconfigDeclarationsProviderData{})
+ gob.Register(android.AconfigReleaseDeclarationsProviderData{})
gob.Register(android.ModuleOutPath{})
}
diff --git a/android/module.go b/android/module.go
index 15976ad..63df6f7 100644
--- a/android/module.go
+++ b/android/module.go
@@ -1921,7 +1921,7 @@
restored := false
if incrementalAnalysis && cacheKey != nil {
- restored = ctx.bp.RestoreBuildActions(cacheKey, incrementalModule)
+ restored = ctx.bp.RestoreBuildActions(cacheKey)
}
if !restored {