diff options
| -rw-r--r-- | core/board_config.mk | 1 | ||||
| -rw-r--r-- | core/local_systemsdk.mk | 6 | ||||
| -rw-r--r-- | core/soong_config.mk | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/core/board_config.mk b/core/board_config.mk index 5a1a781fc6..ae11eb6124 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -186,7 +186,6 @@ _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 3307e72b7c..fcde700f3b 100644 --- a/core/local_systemsdk.mk +++ b/core/local_systemsdk.mk @@ -82,10 +82,8 @@ ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION))) endif ifneq ($(_system_sdk_version),$(filter $(_system_sdk_version),$(_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 + $(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 _system_sdk_version := _supported_systemsdk_versions := diff --git a/core/soong_config.mk b/core/soong_config.mk index b6ce2a7f21..193ac18735 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -299,7 +299,6 @@ $(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)) |