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

Commit fbf1b5e7 authored by Sebastian Pickl's avatar Sebastian Pickl Committed by Gerrit Code Review
Browse files

Revert "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK" 

Revert submission 2897682-dont_limit_systemsdk

Reason for revert: blocking revert for 318695834

Bug:318695834

Reverted changes: /q/submissionid:2897682-dont_limit_systemsdk

Change-Id: I4cf7268cba21c7b81b406c91240bb98190fa4ebc
parent 87312a2f

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -1849,10 +1849,6 @@ 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 || ctx.DeviceConfig().BuildBrokenDontCheckSystemSdk() {

	if !isJava(ctx.Module()) || s.Kind != SdkSystem {

		return true

	}

android/variable.go

+0 −1
Original line number Diff line number Diff line
@@ -448,7 +448,6 @@ type ProductVariables struct { 
	BuildBrokenVendorPropertyNamespace  bool     `json:",omitempty"`

	BuildBrokenIncorrectPartitionImages bool     `json:",omitempty"`

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

	BuildBrokenDontCheckSystemSdk       bool     `json:",omitempty"`



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