Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d0d9630 authored by Sebastian Pickl's avatar Sebastian Pickl Committed by Gerrit Code Review
Browse files

Merge "Revert "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"" into main

parents 3309714a 5ef2634d

core/board_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -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) \

core/local_systemsdk.mk

+2 −4
Original line number Diff line number Diff line
@@ -82,11 +82,9 @@ 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

  endif

  _system_sdk_version :=

  _supported_systemsdk_versions :=

endif

core/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -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))