Revert^2 "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"
fbf1b5e7f1
Change-Id: I2b6c7866eac24b217197d5f659b37b2ae6b4207d
This commit is contained in:
parent
7416d67f28
commit
3bb9924c87
3 changed files with 6 additions and 1 deletions
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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"`
|
||||
|
||||
|
|
Loading…
Reference in a new issue