Merge "Add sepolicy related variables" (fc8e9c7f) · Commits · e / os / android_build_soong

android/config.go

+20 −0

Original line number	Diff line number	Diff line
		@@ -1475,10 +1475,30 @@ func (c *deviceConfig) ShippingApiLevel() ApiLevel {
		return uncheckedFinalApiLevel(apiLevel)
		}

		func (c *deviceConfig) BuildBrokenEnforceSyspropOwner() bool {
		return c.config.productVariables.BuildBrokenEnforceSyspropOwner
		}

		func (c *deviceConfig) BuildBrokenTrebleSyspropNeverallow() bool {
		return c.config.productVariables.BuildBrokenTrebleSyspropNeverallow
		}

		func (c *deviceConfig) BuildBrokenVendorPropertyNamespace() bool {
		return c.config.productVariables.BuildBrokenVendorPropertyNamespace
		}

		func (c *deviceConfig) RequiresInsecureExecmemForSwiftshader() bool {
		return c.config.productVariables.RequiresInsecureExecmemForSwiftshader
		}

		func (c *config) SelinuxIgnoreNeverallows() bool {
		return c.productVariables.SelinuxIgnoreNeverallows
		}

		func (c *deviceConfig) SepolicySplit() bool {
		return c.config.productVariables.SepolicySplit
		}

		// The ConfiguredJarList struct provides methods for handling a list of (apex, jar) pairs.
		// Such lists are used in the build system for things like bootclasspath jars or system server jars.
		// The apex part is either an apex name, or a special names "platform" or "system_ext". Jar is a

+8 −0

Original line number	Diff line number	Diff line
		@@ -379,7 +379,15 @@ type productVariables struct {

		ShippingApiLevel *string `json:",omitempty"`

		BuildBrokenEnforceSyspropOwner bool `json:",omitempty"`
		BuildBrokenTrebleSyspropNeverallow bool `json:",omitempty"`
		BuildBrokenVendorPropertyNamespace bool `json:",omitempty"`

		RequiresInsecureExecmemForSwiftshader bool `json:",omitempty"`

		SelinuxIgnoreNeverallows bool `json:",omitempty"`

		SepolicySplit bool `json:",omitempty"`
		}

		func boolPtr(v bool) *bool {