tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK" into main

Browse source
This commit is contained in:
Joe Onorato 2024-01-04 17:40:49 +00:00 committed by Gerrit Code Review
commit 7a0823fb77
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/config.go
View file

@ -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
}

2
android/sdk_version.go
View file

@ -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
}

1
android/variable.go
View file

@ -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"`