Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bf4079e authored by Yu Liu's avatar Yu Liu Committed by Gerrit Code Review
Browse files

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

parents 246b4304 f072120c

aconfig/aconfig_declarations.go

+4 −9
Original line number Diff line number Diff line
@@ -220,15 +220,10 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module 
}



func (module *DeclarationsModule) BuildActionProviderKeys() []blueprint.AnyProviderKey {

	return []blueprint.AnyProviderKey{android.AconfigDeclarationsProviderKey}

	return []blueprint.AnyProviderKey{

		android.AconfigDeclarationsProviderKey,

		android.AconfigReleaseDeclarationsProviderKey,

	}



func (module *DeclarationsModule) PackageContextPath() string {

	return pkgPath

}



func (module *DeclarationsModule) CachedRules() []blueprint.Rule {

	return []blueprint.Rule{aconfigRule, aconfigTextRule}

}



var _ blueprint.Incremental = &DeclarationsModule{}

aconfig/init.go

+2 −2
Original line number Diff line number Diff line
@@ -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{})

}

android/module.go

+1 −1
Original line number Diff line number Diff line
@@ -1921,7 +1921,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) 


		restored := false

		if incrementalAnalysis && cacheKey != nil {

			restored = ctx.bp.RestoreBuildActions(cacheKey, incrementalModule)

			restored = ctx.bp.RestoreBuildActions(cacheKey)

		}



		if !restored {