From 885b004547a65be0501f9d736e2dc3e442dfcc48 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"

5ef2634d5a720228c9b7e09d76c57fec392ccee2

Change-Id: I4430ac4b2411baf3f33695ba3b1520345d7f493d
---
 core/board_config.mk    | 1 +
 core/local_systemsdk.mk | 6 ++++--
 core/soong_config.mk    | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/board_config.mk b/core/board_config.mk
index ae11eb6124..5a1a781fc6 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -186,6 +186,7 @@ _build_broken_var_list := \
   BUILD_BROKEN_VINTF_PRODUCT_COPY_FILES \
   BUILD_BROKEN_INCORRECT_PARTITION_IMAGES \
   BUILD_BROKEN_GENRULE_SANDBOXING \
+  BUILD_BROKEN_DONT_CHECK_SYSTEMSDK \
 
 _build_broken_var_list += \
   $(foreach m,$(AVAILABLE_BUILD_MODULE_TYPES) \
diff --git a/core/local_systemsdk.mk b/core/local_systemsdk.mk
index fcde700f3b..3307e72b7c 100644
--- a/core/local_systemsdk.mk
+++ b/core/local_systemsdk.mk
@@ -82,8 +82,10 @@ ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))
   endif
 
   ifneq ($(_system_sdk_version),$(filter $(_system_sdk_version),$(_supported_systemsdk_versions)))
-    $(call pretty-error,Incompatible LOCAL_SDK_VERSION '$(LOCAL_SDK_VERSION)'. \
-           System SDK version '$(_system_sdk_version)' is not supported. Supported versions are: $(_supported_systemsdk_versions))
+    ifneq (true,$(BUILD_BROKEN_DONT_CHECK_SYSTEMSDK)
+      $(call pretty-error,Incompatible LOCAL_SDK_VERSION '$(LOCAL_SDK_VERSION)'. \
+             System SDK version '$(_system_sdk_version)' is not supported. Supported versions are: $(_supported_systemsdk_versions))
+    endif
   endif
   _system_sdk_version :=
   _supported_systemsdk_versions :=
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 193ac18735..b6ce2a7f21 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -299,6 +299,7 @@ $(call add_json_bool, BuildBrokenUsesSoongPython2Modules,  $(filter true,$(BUILD
 $(call add_json_bool, BuildBrokenVendorPropertyNamespace,  $(filter true,$(BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE)))
 $(call add_json_bool, BuildBrokenIncorrectPartitionImages, $(filter true,$(BUILD_BROKEN_INCORRECT_PARTITION_IMAGES)))
 $(call add_json_list, BuildBrokenInputDirModules,          $(BUILD_BROKEN_INPUT_DIR_MODULES))
+$(call add_json_bool, BuildBrokenDontCheckSystemSdk,       $(filter true,$(BUILD_BROKEN_DONT_CHECK_SYSTEMSDK)))
 
 $(call add_json_list, BuildWarningBadOptionalUsesLibsAllowlist,    $(BUILD_WARNING_BAD_OPTIONAL_USES_LIBS_ALLOWLIST))