Merge "Rename aconfig intermediate file (json -> pb)"
diff --git a/device_config/device_config_definitions.go b/device_config/device_config_definitions.go
index bb78695..ab2e4f7 100644
--- a/device_config/device_config_definitions.go
+++ b/device_config/device_config_definitions.go
@@ -122,7 +122,7 @@
// 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 49afcc4..6bc6eaa 100644
--- a/device_config/device_config_definitions_test.go
+++ b/device_config/device_config_definitions_test.go
@@ -36,7 +36,7 @@
// 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())
}
}