Merge "Revert "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"" into main
diff --git a/android/config.go b/android/config.go
index 1ea0d94..24b9b8a 100644
--- a/android/config.go
+++ b/android/config.go
@@ -1849,10 +1849,6 @@
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
}
diff --git a/android/sdk_version.go b/android/sdk_version.go
index 73568af..9c84a27 100644
--- a/android/sdk_version.go
+++ b/android/sdk_version.go
@@ -306,7 +306,7 @@
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
}
diff --git a/android/variable.go b/android/variable.go
index 9844080..fa4cfc1 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -448,7 +448,6 @@
BuildBrokenVendorPropertyNamespace bool `json:",omitempty"`
BuildBrokenIncorrectPartitionImages bool `json:",omitempty"`
BuildBrokenInputDirModules []string `json:",omitempty"`
- BuildBrokenDontCheckSystemSdk bool `json:",omitempty"`
BuildWarningBadOptionalUsesLibsAllowlist []string `json:",omitempty"`