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

Merge "Skip writing ninja file for module with a cache hit during incremental build." into main am: 8bf4079e5f

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

Change-Id: I9499830d7a05690bcb4f3be40cf5261bca1541a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Liu
2024-08-13 17:34:46 +00:00
committed by Automerger Merge Worker
parent 73282e8129 8bf4079e5f
commit 2db4f06825
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
aconfig/aconfig_declarations.go
View File

@@ -220,15 +220,10 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module
}
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{}

4
aconfig/init.go
View File

@@ -23,8 +23,7 @@ import (
)
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 @@ func init() {
pctx.HostBinToolVariable("soong_zip", "soong_zip")
gob.Register(android.AconfigDeclarationsProviderData{})
gob.Register(android.AconfigReleaseDeclarationsProviderData{})
gob.Register(android.ModuleOutPath{})
}