StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"" into main am: 13c52b9963

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

Change-Id: If8c6d4fbe8ff40962bf318517a30a4b5e9a21a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sebastian Pickl
2024-01-04 20:02:34 +00:00
committed by Automerger Merge Worker
parent b82ea38ffb 13c52b9963
commit 9145acd17a
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

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

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 || ctx.DeviceConfig().BuildBrokenDontCheckSystemSdk() {
if !isJava(ctx.Module()) || s.Kind != SdkSystem {
return true
}

1
android/variable.go
View File

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