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

Merge "Rename aconfig intermediate file (json -> pb)"

Browse Source
This commit is contained in:
Mårten Kongstad
2023-06-21 13:30:20 +00:00
committed by Gerrit Code Review
parent c357c81f48 c89e924ec2
commit 8f55732317
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
device_config/device_config_definitions.go
View File

@@ -122,7 +122,7 @@ func (module *DefinitionsModule) GenerateAndroidBuildActions(ctx android.ModuleC
// Intermediate format // Intermediate format
inputFiles := android.PathsForModuleSrc(ctx, module.properties.Srcs) inputFiles := android.PathsForModuleSrc(ctx, module.properties.Srcs)
intermediatePath := android.PathForModuleOut(ctx, "intermediate.json") intermediatePath := android.PathForModuleOut(ctx, "intermediate.pb")
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: aconfigRule, Rule: aconfigRule,
Inputs: inputFiles, Inputs: inputFiles,

2
device_config/device_config_definitions_test.go
View File

@@ -36,7 +36,7 @@ func TestDeviceConfigDefinitions(t *testing.T) {
// Check that the provider has the right contents // Check that the provider has the right contents
depData := result.ModuleProvider(module, definitionsProviderKey).(definitionsProviderData) depData := result.ModuleProvider(module, definitionsProviderKey).(definitionsProviderData)
android.AssertStringEquals(t, "namespace", depData.namespace, "com.example.package") android.AssertStringEquals(t, "namespace", depData.namespace, "com.example.package")
if !strings.HasSuffix(depData.intermediatePath.String(), "/intermediate.json") { if !strings.HasSuffix(depData.intermediatePath.String(), "/intermediate.pb") {
t.Errorf("Missing intermediates path in provider: %s", depData.intermediatePath.String()) t.Errorf("Missing intermediates path in provider: %s", depData.intermediatePath.String())
} }
} }