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

Commit cf331d93 authored by Ian Rogers's avatar Ian Rogers
Browse files

Host support for prefer symlink 

We need a host symlink for dalvik, our *-dalvik-host build targets
are failing.

Change-Id: I6045de20c948b456a150033deb3459895aff83c6
parent e1b43254

core/executable_prefer_symlink.mk

+21 −9
Original line number Diff line number Diff line
@@ -4,11 +4,13 @@ 
#

# Note: now only limited to the binaries that will be installed under system/bin directory



my_symlink := $(addprefix $(TARGET_OUT)/bin/, $(LOCAL_MODULE))

# Create link to the one used depending on the target

# configuration. Note that we require the TARGET_IS_64_BIT

# check because 32 bit targets may not define TARGET_PREFER_32_BIT_APPS

# et al. since those variables make no sense in that context.



ifneq ($(LOCAL_IS_HOST_MODULE),true)

  my_symlink := $(addprefix $(TARGET_OUT)/bin/, $(LOCAL_MODULE))

  ifeq ($(TARGET_IS_64_BIT),true)

    ifneq ($(TARGET_PREFER_32_BIT_APPS),true)

$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_64)
@@ -18,7 +20,14 @@ endif 
  else

$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32)

  endif



else

  my_symlink := $(addprefix $(HOST_OUT)/bin/, $(LOCAL_MODULE))

  ifneq ($(HOST_PREFER_32_BIT),true)

$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_64)

  else

$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32)

  endif

endif



$(my_symlink): $(LOCAL_INSTALLED_MODULE) $(LOCAL_MODULE_MAKEFILE)

	@echo "Symlink: $@ -> $(PRIVATE_SRC_BINARY_NAME)"
@@ -30,4 +39,7 @@ $(my_symlink): $(LOCAL_INSTALLED_MODULE) $(LOCAL_MODULE_MAKEFILE) 
# local module name

ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_symlink)



# Create the symlink when you run mm/mmm or "make <module_name>"

$(LOCAL_MODULE) : $(my_symlink)



my_symlink :=