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

Commit 55d25a43 authored Jul 19, 2023 by Treehugger Robot Committed by Gerrit Code Review Jul 19, 2023

Merge "Pass declarations as separate arguments" into main

parents 12a1f918 8a35a6fa

aconfig/aconfig_declarations.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -125,12 +125,12 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module
		intermediatePath := android.PathForModuleOut(ctx, "intermediate.pb")
		ctx.Build(pctx, android.BuildParams{
		Rule: aconfigRule,
		Inputs: inputFiles,
		Output: intermediatePath,
		Description: "aconfig_declarations",
		Args: map[string]string{
		"release_version": ctx.Config().ReleaseVersion(),
		"package": module.properties.Package,
		"declarations": android.JoinPathsWithPrefix(inputFiles, "--declarations "),
		"values": joinAndPrefix(" --values ", module.properties.Values),
		},
		})

aconfig/aconfig_declarations_test.go

+4 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,10 @@ func TestAconfigDeclarations(t *testing.T) {
		aconfig_declarations {
		name: "module_name",
		package: "com.example.package",
		srcs: ["foo.aconfig"],
		srcs: [
		"foo.aconfig",
		"bar.aconfig",
		],
		}
		`
		result := runTest(t, android.FixtureExpectsNoErrors, bp)

aconfig/init.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ var (
		blueprint.RuleParams{
		Command: `${aconfig} create-cache` +
		` --package ${package}` +
		` --declarations ${in}` +
		` ${declarations}` +
		` ${values}` +
		` --cache ${out}.tmp` +
		` && ( if cmp -s ${out}.tmp ; then rm ${out}.tmp ; else mv ${out}.tmp ${out} ; fi )`,
		@@ -36,7 +36,7 @@ var (
		"${aconfig}",
		},
		Restat: true,
		}, "release_version", "package", "values")
		}, "release_version", "package", "declarations", "values")

		// For java_aconfig_library: Generate java file
		srcJarRule = pctx.AndroidStaticRule("aconfig_srcjar",