From 3bb9924c87bf4107ba361fc1ccb6c7dfd9446f75 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Thu, 4 Jan 2024 23:21:26 +0000
Subject: [PATCH] Revert^2 "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"

fbf1b5e7f1caffdae4340f20802be5702e043c3b

Change-Id: I2b6c7866eac24b217197d5f659b37b2ae6b4207d
---
 android/config.go      | 4 ++++
 android/sdk_version.go | 2 +-
 android/variable.go    | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/android/config.go b/android/config.go
index 24b9b8a62..1ea0d949c 100644
--- a/android/config.go
+++ b/android/config.go
@@ -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
 }
diff --git a/android/sdk_version.go b/android/sdk_version.go
index 9c84a27f8..73568af8a 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 {
+	if !isJava(ctx.Module()) || s.Kind != SdkSystem || ctx.DeviceConfig().BuildBrokenDontCheckSystemSdk() {
 		return true
 	}
 
diff --git a/android/variable.go b/android/variable.go
index fa4cfc1fd..98440802f 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -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"`