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

Commit 030fe1b3 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Revert "Revert "Better error for missing LOCAL_SRC_FILES in prebuilts""" am: 08e604e7 

am: 144cb735

Change-Id: I9949ac413760b2d8623316c1b9821e3f2afaea64
parents e6043b1f 144cb735

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

else ifdef LOCAL_SRC_FILES

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

  LOCAL_SRC_FILES :=

    endif

  endif

else ifdef LOCAL_REPLACE_PREBUILT_APK_INSTALLED

  # This is handled specially below

else

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

endif



LOCAL_CHECKED_MODULE := $(my_prebuilt_src_file)