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

Merge "Rename aconfig intermediate file (json -> pb)" am: 8f55732317 am: e1a30716f8 am: 09f85b6abc

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

Change-Id: Ie308988ee8f9a5331e68a2bf9c49d61f3674a1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mårten Kongstad
2023-06-21 15:38:47 +00:00
committed by Automerger Merge Worker
parent 112fa9b71f 09f85b6abc
commit 5b5bee3ed8
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())
} }
} }