From c89e924ec2047c9fc23290c652d80e3964a469a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Wed, 21 Jun 2023 08:32:53 +0200 Subject: [PATCH] Rename aconfig intermediate file (json -> pb) aconfig's intermediate file ("the cache") has changed format from json to protobuf. Rename the generated file accordingly. Bug: 283910447 Test: m nothing # run soong tests Change-Id: Iaff408774cfba4231dfb951b112b554466b8e884 --- device_config/device_config_definitions.go | 2 +- device_config/device_config_definitions_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device_config/device_config_definitions.go b/device_config/device_config_definitions.go index bb78695f1..ab2e4f78a 100644 --- a/device_config/device_config_definitions.go +++ b/device_config/device_config_definitions.go @@ -122,7 +122,7 @@ func (module *DefinitionsModule) GenerateAndroidBuildActions(ctx android.ModuleC // Intermediate format inputFiles := android.PathsForModuleSrc(ctx, module.properties.Srcs) - intermediatePath := android.PathForModuleOut(ctx, "intermediate.json") + intermediatePath := android.PathForModuleOut(ctx, "intermediate.pb") ctx.Build(pctx, android.BuildParams{ Rule: aconfigRule, Inputs: inputFiles, diff --git a/device_config/device_config_definitions_test.go b/device_config/device_config_definitions_test.go index 49afcc4d5..6bc6eaa10 100644 --- a/device_config/device_config_definitions_test.go +++ b/device_config/device_config_definitions_test.go @@ -36,7 +36,7 @@ func TestDeviceConfigDefinitions(t *testing.T) { // Check that the provider has the right contents depData := result.ModuleProvider(module, definitionsProviderKey).(definitionsProviderData) 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()) } }