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

Merge "Add test mode support for rust_aconfig_library" into main am: a207d486e1 am: d6c3a399dc am: decffb2813 am: 6ba3996f5c

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

Change-Id: I0affe916630599444a6d9226a5f5da43b3d82ecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vinh Tran
2023-08-17 16:42:05 +00:00
committed by Automerger Merge Worker
parent 2f72359f37 6ba3996f5c
commit cc3e2d6de2
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
aconfig/rust_aconfig_library.go
View File

@@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"github.com/google/blueprint" "github.com/google/blueprint"
"github.com/google/blueprint/proptools"
) )
type rustDeclarationsTagType struct { type rustDeclarationsTagType struct {
@@ -17,6 +18,7 @@ var rustDeclarationsTag = rustDeclarationsTagType{}
type RustAconfigLibraryProperties struct { type RustAconfigLibraryProperties struct {
// name of the aconfig_declarations module to generate a library for // name of the aconfig_declarations module to generate a library for
Aconfig_declarations string Aconfig_declarations string
Test *bool
} }
type aconfigDecorator struct { type aconfigDecorator struct {
@@ -58,6 +60,11 @@ func (a *aconfigDecorator) GenerateSource(ctx rust.ModuleContext, deps rust.Path
} }
declarations := ctx.OtherModuleProvider(declarationsModules[0], declarationsProviderKey).(declarationsProviderData) declarations := ctx.OtherModuleProvider(declarationsModules[0], declarationsProviderKey).(declarationsProviderData)
mode := "production"
if proptools.Bool(a.Properties.Test) {
mode = "test"
}
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: rustRule, Rule: rustRule,
Input: declarations.IntermediatePath, Input: declarations.IntermediatePath,
@@ -67,8 +74,7 @@ func (a *aconfigDecorator) GenerateSource(ctx rust.ModuleContext, deps rust.Path
Description: "rust_aconfig_library", Description: "rust_aconfig_library",
Args: map[string]string{ Args: map[string]string{
"gendir": generatedDir.String(), "gendir": generatedDir.String(),
// TODO: Add test mode "mode": mode,
"mode": "production",
}, },
}) })
a.BaseSourceProvider.OutputFiles = android.Paths{generatedSource} a.BaseSourceProvider.OutputFiles = android.Paths{generatedSource}