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

Commit 87312a2f authored Jan 04, 2024 by Jiyong Park

Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK

https://android-review.git.corp.google.com/q/topic:limit_systemsdk
introduced a new check for preventing the use of system SDKs above 34
from Java modules in the vendor partition.

As this may break some unprepared targets, introduce
BUILD_BROKEN_DONT_CHECK_SYSTEMSDK as a temporary escape hatch.

This flag will be deleted eventually.

Bug: 314011075
Test: Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK := true to BoardConfig.mk
Change-Id: Id7901f85c221bc03fa1c15ef15dbec14b783a79a

parent ec47e99b

android/config.go

+4 −0

Original line number	Diff line number	Diff line
		@@ -1849,6 +1849,10 @@ func (c *deviceConfig) BuildBrokenInputDir(name string) bool {
		return InList(name, c.config.productVariables.BuildBrokenInputDirModules)
		}

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

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

android/sdk_version.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ func SdkSpecFromWithConfig(config Config, str string) SdkSpec {
		func (s SdkSpec) ValidateSystemSdk(ctx EarlyModuleContext) bool {
		// Do some early checks. This check is currently only for Java modules. And our only concern
		// is the use of "system" SDKs.
		if !isJava(ctx.Module()) \|\| s.Kind != SdkSystem {
		if !isJava(ctx.Module()) \|\| s.Kind != SdkSystem \|\| ctx.DeviceConfig().BuildBrokenDontCheckSystemSdk() {
		return true
		}

android/variable.go

+1 −0

Original line number	Diff line number	Diff line
		@@ -448,6 +448,7 @@ type ProductVariables struct {
		BuildBrokenVendorPropertyNamespace bool `json:",omitempty"`
		BuildBrokenIncorrectPartitionImages bool `json:",omitempty"`
		BuildBrokenInputDirModules []string `json:",omitempty"`
		BuildBrokenDontCheckSystemSdk bool `json:",omitempty"`

		BuildWarningBadOptionalUsesLibsAllowlist []string `json:",omitempty"`