Merge "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong"" into main (1282d272) · Commits · e / os / android_build_soong

android/androidmk.go

+0 −1

Original line number	Diff line number	Diff line
		@@ -910,7 +910,6 @@ 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))

+0 −16

Original line number	Diff line number	Diff line
		@@ -2060,19 +2060,3 @@ func (c *config) ProductPropFiles(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 −5

Original line number	Diff line number	Diff line
		@@ -514,11 +514,6 @@ type ProductVariables struct {
		ProductPropFiles []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 {