Merge "Build contexts files with Soong" (a5d61d86) · Commits · e / os / android_build_soong

android/config.go

+16 −0

Original line number	Diff line number	Diff line
		@@ -932,6 +932,10 @@ func (c *deviceConfig) PlatPrivateSepolicyDirs() []string {
		return c.config.productVariables.BoardPlatPrivateSepolicyDirs
		}

		func (c *deviceConfig) SepolicyM4Defs() []string {
		return c.config.productVariables.BoardSepolicyM4Defs
		}

		func (c *deviceConfig) OverrideManifestPackageNameFor(name string) (manifestName string, overridden bool) {
		return findOverrideValue(c.config.productVariables.ManifestPackageNameOverrides, name,
		"invalid override rule %q in PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES should be <module_name>:<manifest_name>")
		@@ -1064,3 +1068,15 @@ func (c *config) ProductHiddenAPIStubsTest() []string {
		func (c *deviceConfig) TargetFSConfigGen() []string {
		return c.config.productVariables.TargetFSConfigGen
		}

		func (c *config) ProductPublicSepolicyDirs() []string {
		return c.productVariables.ProductPublicSepolicyDirs
		}

		func (c *config) ProductPrivateSepolicyDirs() []string {
		return c.productVariables.ProductPrivateSepolicyDirs
		}

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -267,6 +267,7 @@ type productVariables struct {
		BoardOdmSepolicyDirs []string `json:",omitempty"`
		BoardPlatPublicSepolicyDirs []string `json:",omitempty"`
		BoardPlatPrivateSepolicyDirs []string `json:",omitempty"`
		BoardSepolicyM4Defs []string `json:",omitempty"`

		VendorVars map[string]map[string]string `json:",omitempty"`

		@@ -288,6 +289,10 @@ type productVariables struct {
		ProductHiddenAPIStubsSystem []string `json:",omitempty"`
		ProductHiddenAPIStubsTest []string `json:",omitempty"`

		ProductPublicSepolicyDirs []string `json:",omitempty"`
		ProductPrivateSepolicyDirs []string `json:",omitempty"`
		ProductCompatibleProperty *bool `json:",omitempty"`

		TargetFSConfigGen []string `json:",omitempty"`
		}