Revert^2 "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"
5ef2634d5a
Change-Id: I4430ac4b2411baf3f33695ba3b1520345d7f493d
This commit is contained in:
parent
7a66924a60
commit
885b004547
3 changed files with 6 additions and 2 deletions
|
@ -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) \
|
||||
|
|
|
@ -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 :=
|
||||
|
|
|
@ -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))
|
||||
|
||||
|
|
Loading…
Reference in a new issue