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

Commit 15abdec6 authored Aug 07, 2020 by Treehugger Robot Committed by Automerger Merge Worker Aug 07, 2020

Merge "Add BoardKernelModuleInterfaceVersions." am: f3ab7293 am: a7586115...

Merge "Add BoardKernelModuleInterfaceVersions." am: f3ab7293 am: a7586115 am: 049efa55 am: a1a15c5e

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

Change-Id: Iff9fbdcf7feafeacb8de69ed2f56fb4c85824a52

parents bb5d5122 a1a15c5e

android/config.go

+4 −0

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

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

	// The ConfiguredJarList struct provides methods for handling a list of (apex, jar) pairs.		// 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.		// 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		// The apex part is either an apex name, or a special names "platform" or "system_ext". Jar is a

android/variable.go

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -346,6 +346,7 @@ type productVariables struct {
	BoardUsesRecoveryAsBoot *bool `json:",omitempty"`		BoardUsesRecoveryAsBoot *bool `json:",omitempty"`

	BoardKernelBinaries []string `json:",omitempty"`		BoardKernelBinaries []string `json:",omitempty"`
			BoardKernelModuleInterfaceVersions []string `json:",omitempty"`
	}		}

	func boolPtr(v bool) *bool {		func boolPtr(v bool) *bool {