diff options
| author | 2024-01-04 19:01:27 +0000 | |
|---|---|---|
| committer | 2024-01-04 19:01:27 +0000 | |
| commit | fbf1b5e7f1caffdae4340f20802be5702e043c3b (patch) | |
| tree | 848051794adaf11ce1b9b6efd710b87dc545295d | |
| parent | 87312a2facfe2d50ab4d002dcdbc5a0f67dbd2b3 (diff) | |
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
| -rw-r--r-- | android/config.go | 4 | ||||
| -rw-r--r-- | android/sdk_version.go | 2 | ||||
| -rw-r--r-- | android/variable.go | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/android/config.go b/android/config.go index 1ea0d949c..24b9b8a62 100644 --- a/android/config.go +++ b/android/config.go @@ -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 } diff --git a/android/sdk_version.go b/android/sdk_version.go index 73568af8a..9c84a27f8 100644 --- a/android/sdk_version.go +++ b/android/sdk_version.go @@ -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 } diff --git a/android/variable.go b/android/variable.go index 98440802f..fa4cfc1fd 100644 --- a/android/variable.go +++ b/android/variable.go @@ -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"` |