Snap for 12335440 from b35a9f40b9e2ed053f710d212317dc6d7b969680 to 24Q4-release (daebf852) · Commits · e / os / android_build_soong

android/androidmk.go

+1 −0

Original line number	Diff line number	Diff line
		@@ -920,6 +920,7 @@ func translateAndroidModule(ctx SingletonContext, w io.Writer, moduleInfoJSONs *
		case "*phony.PhonyRule": // writes phony deps and acts like `.PHONY`
		case "*selinux.selinuxContextsModule": // license properties written
		case "*sysprop.syspropLibrary": // license properties written
		case "*vintf.vintfCompatibilityMatrixRule": // use case like phony
		default:
		if !ctx.Config().IsEnvFalse("ANDROID_REQUIRE_LICENSES") {
		return fmt.Errorf("custom make rules not allowed for %q (%q) module %q", ctx.ModuleType(mod), reflect.TypeOf(mod), ctx.ModuleName(mod))

+3 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,9 @@ type ApexInfo struct {

		// Returns the name of the overridden apex (com.android.foo)
		BaseApexName string

		// Returns the value of `apex_available_name`
		ApexAvailableName string
		}

		// AllApexInfo holds the ApexInfo of all apexes that include this module.

+20 −0

Original line number	Diff line number	Diff line
		@@ -1962,6 +1962,10 @@ func (c *config) UseResourceProcessorByDefault() bool {
		return c.productVariables.GetBuildFlagBool("RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT")
		}

		func (c *config) UseTransitiveJarsInClasspath() bool {
		return c.productVariables.GetBuildFlagBool("RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH")
		}

		var (
		mainlineApexContributionBuildFlagsToApexNames = map[string]string{
		"RELEASE_APEX_CONTRIBUTIONS_ADBD": "com.android.adbd",
		@@ -2064,3 +2068,19 @@ func (c *config) OdmPropFiles(ctx PathContext) Paths {
		func (c *config) EnableUffdGc() string {
		return String(c.productVariables.EnableUffdGc)
		}

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

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

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

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@ package android

		import (
		"github.com/google/blueprint"
		"github.com/google/blueprint/bootstrap"
		)

		var (
		@@ -120,8 +119,3 @@ func init() {
		return ctx.Config().RBEWrapper()
		})
		}

		// GlobToListFileRule creates a rule that writes a list of files matching a pattern to a file.
		func GlobToListFileRule(ctx ModuleContext, pattern string, excludes []string, file WritablePath) {
		bootstrap.GlobFile(ctx.blueprintModuleContext(), pattern, excludes, file.String())
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -515,6 +515,11 @@ type ProductVariables struct {
		OdmPropFiles []string `json:",omitempty"`

		EnableUffdGc *string `json:",omitempty"`

		BoardAvbEnable *bool `json:",omitempty"`
		BoardAvbSystemAddHashtreeFooterArgs []string `json:",omitempty"`
		DeviceFrameworkCompatibilityMatrixFile []string `json:",omitempty"`
		DeviceProductCompatibilityMatrixFile []string `json:",omitempty"`
		}

		type PartitionQualifiedVariablesType struct {