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

Commit cf1b7d4b authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Select src arch for prebuilts."

parents 031bff45 6c930fc1

core/definitions.mk

+7 −0
Original line number Diff line number Diff line
@@ -2145,6 +2145,13 @@ define include-if-build-from-source 
$(if $(call if-build-from-source,$(2),$(3)),$(eval include $(1)))

endef



## Return the arch for the source file of a prebuilt

# $(1) the list of archs supported by the prebuilt

define get-prebuilt-src-arch

$(strip $(if $(filter $(TARGET_ARCH),$(1)),$(TARGET_ARCH),\

  $(if $(filter $(TARGET_2ND_ARCH),$(1)),$(TARGET_2ND_ARCH))))

endef



###########################################################

## Other includes

###########################################################

core/prebuilt_internal.mk

+6 −2
Original line number Diff line number Diff line
@@ -21,9 +21,13 @@ LOCAL_DONT_CHECK_MODULE := true 


ifdef LOCAL_PREBUILT_MODULE_FILE

  my_prebuilt_src_file := $(LOCAL_PREBUILT_MODULE_FILE)

else

  ifdef LOCAL_SRC_FILES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)

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

  else

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

  endif

endif



ifdef LOCAL_IS_HOST_MODULE

  my_prefix := HOST_