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

Commit e752292f authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Revert "Better error for missing LOCAL_SRC_FILES in prebuilts""

parents 3279e0c2 f7806986

core/prebuilt_internal.mk

+12 −12
Original line number Diff line number Diff line
@@ -20,19 +20,19 @@ my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)IS_64_BIT) 


ifdef LOCAL_PREBUILT_MODULE_FILE

  my_prebuilt_src_file := $(LOCAL_PREBUILT_MODULE_FILE)

else ifdef LOCAL_SRC_FILES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)

else

  ifdef LOCAL_SRC_FILES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)

    my_prebuilt_src_file := $(LOCAL_PATH)/$(LOCAL_SRC_FILES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))

    LOCAL_SRC_FILES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) :=

else ifdef LOCAL_SRC_FILES_$(my_32_64_bit_suffix)

  else

    ifdef LOCAL_SRC_FILES_$(my_32_64_bit_suffix)

      my_prebuilt_src_file := $(LOCAL_PATH)/$(LOCAL_SRC_FILES_$(my_32_64_bit_suffix))

      LOCAL_SRC_FILES_$(my_32_64_bit_suffix) :=

else ifdef LOCAL_SRC_FILES

    else

      my_prebuilt_src_file := $(LOCAL_PATH)/$(LOCAL_SRC_FILES)

      LOCAL_SRC_FILES :=

else ifdef LOCAL_REPLACE_PREBUILT_APK_INSTALLED

  # This is handled specially below

else

  $(call pretty-error,No source files specified)

    endif

  endif

endif



LOCAL_CHECKED_MODULE := $(my_prebuilt_src_file)