Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f557323 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Gerrit Code Review
Browse files

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

parents c357c81f c89e924e

device_config/device_config_definitions.go

+1 −1
Original line number Diff line number Diff line
@@ -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,

device_config/device_config_definitions_test.go

+1 −1
Original line number Diff line number Diff line
@@ -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())

	}

}