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

Commit e1d9d9e6 authored by Zhi Dou's avatar Zhi Dou Committed by Automerger Merge Worker
Browse files

Merge "Support default-permission in aconfig_declarations" into main am: 1f82aea3 

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



Change-Id: I72f8b6e7ef22fc1cff5efb58a38bb6e729476c98
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 377b9b68 1f82aea3

aconfig/aconfig_declarations.go

+15 −4
Original line number Diff line number Diff line
@@ -97,6 +97,15 @@ func joinAndPrefix(prefix string, values []string) string { 
	return sb.String()

}



func optionalVariable(prefix string, value string) string {

	var sb strings.Builder

	if value != "" {

		sb.WriteString(prefix)

		sb.WriteString(value)

	}

	return sb.String()

}



// Provider published by aconfig_value_set

type declarationsProviderData struct {

	Package          string
@@ -124,6 +133,7 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module 
	// Intermediate format

	inputFiles := android.PathsForModuleSrc(ctx, module.properties.Srcs)

	intermediatePath := android.PathForModuleOut(ctx, "intermediate.pb")

	defaultPermission := ctx.Config().ReleaseAconfigFlagDefaultPermission()

	ctx.Build(pctx, android.BuildParams{

		Rule:        aconfigRule,

		Output:      intermediatePath,
@@ -133,6 +143,7 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module 
			"package":            module.properties.Package,

			"declarations":       android.JoinPathsWithPrefix(inputFiles, "--declarations "),

			"values":             joinAndPrefix(" --values ", module.properties.Values),

			"default-permission": optionalVariable(" --default-permission ", defaultPermission),

		},

	})

aconfig/init.go

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ var ( 
				` --package ${package}` +

				` ${declarations}` +

				` ${values}` +

				` ${default-permission}` +

				` --cache ${out}.tmp` +

				` && ( if cmp -s ${out}.tmp ${out} ; then rm ${out}.tmp ; else mv ${out}.tmp ${out} ; fi )`,

			//				` --build-id ${release_version}` +
@@ -37,7 +38,7 @@ var ( 
				"${aconfig}",

			},

			Restat: true,

		}, "release_version", "package", "declarations", "values")

		}, "release_version", "package", "declarations", "values", "default-permission")



	// For java_aconfig_library: Generate java file

	javaRule = pctx.AndroidStaticRule("java_aconfig_library",

android/config.go

+6 −0
Original line number Diff line number Diff line
@@ -206,6 +206,12 @@ func (c Config) ReleaseAconfigValueSets() []string { 
	return c.config.productVariables.ReleaseAconfigValueSets

}



// The flag default permission value passed to aconfig

// derived from RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION

func (c Config) ReleaseAconfigFlagDefaultPermission() string {

	return c.config.productVariables.ReleaseAconfigFlagDefaultPermission

}



// A DeviceConfig object represents the configuration for a particular device

// being built. For now there will only be one of these, but in the future there

// may be multiple devices being built.

android/variable.go

+2 −0
Original line number Diff line number Diff line
@@ -482,6 +482,8 @@ type ProductVariables struct { 
	ReleaseVersion          string   `json:",omitempty"`

	ReleaseAconfigValueSets []string `json:",omitempty"`



	ReleaseAconfigFlagDefaultPermission string `json:",omitempty"`



	KeepVndk *bool `json:",omitempty"`

}