Merge "Move the caching/restoring code from soong to blueprint to fully skip build actions." into main am: c55b25f125
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249489 Change-Id: I43e2ee71097e95e313eab8631742acb8048e36d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -219,11 +219,4 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module
|
||||
android.SetProvider(ctx, android.AconfigReleaseDeclarationsProviderKey, providerData)
|
||||
}
|
||||
|
||||
func (module *DeclarationsModule) BuildActionProviderKeys() []blueprint.AnyProviderKey {
|
||||
return []blueprint.AnyProviderKey{
|
||||
android.AconfigDeclarationsProviderKey,
|
||||
android.AconfigReleaseDeclarationsProviderKey,
|
||||
}
|
||||
}
|
||||
|
||||
var _ blueprint.Incremental = &DeclarationsModule{}
|
||||
|
@@ -15,8 +15,6 @@
|
||||
package aconfig
|
||||
|
||||
import (
|
||||
"encoding/gob"
|
||||
|
||||
"android/soong/android"
|
||||
|
||||
"github.com/google/blueprint"
|
||||
@@ -108,10 +106,6 @@ func init() {
|
||||
RegisterBuildComponents(android.InitRegistrationContext)
|
||||
pctx.HostBinToolVariable("aconfig", "aconfig")
|
||||
pctx.HostBinToolVariable("soong_zip", "soong_zip")
|
||||
|
||||
gob.Register(android.AconfigDeclarationsProviderData{})
|
||||
gob.Register(android.AconfigReleaseDeclarationsProviderData{})
|
||||
gob.Register(android.ModuleOutPath{})
|
||||
}
|
||||
|
||||
func RegisterBuildComponents(ctx android.RegistrationContext) {
|
||||
|
Reference in New Issue
Block a user