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

Commit 4fb8122b authored by Narayan Kamath's avatar Narayan Kamath
Browse files

Fix executable symlinks. 

32 bit targets will leave TARGET_PREFER_{32,64}_BIT_APPS unset
so adjust accordingly. Also clean up an explanatory comment.

Change-Id: I1f6faa640e4e862631fff49f7c565766ef2c567f
parent b082b5f1

core/executable_prefer_symlink.mk

+9 −1
Original line number Diff line number Diff line
@@ -5,12 +5,20 @@ 
# 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 for prefer version

# 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.

ifeq ($(TARGET_IS_64_BIT),true)

ifneq ($(TARGET_PREFER_32_BIT_APPS),true)

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

else

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

endif

else

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

endif





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

	@echo "Symlink: $@ -> $(PRIVATE_SRC_BINARY_NAME)"