diff options
Diffstat (limited to 'core/executable_prefer_symlink.mk')
| -rw-r--r-- | core/executable_prefer_symlink.mk | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/core/executable_prefer_symlink.mk b/core/executable_prefer_symlink.mk index 9b9814e3b8..fea0bef64b 100644 --- a/core/executable_prefer_symlink.mk +++ b/core/executable_prefer_symlink.mk @@ -5,22 +5,13 @@ # Note: now only limited to the binaries that will be installed under system/bin directory # 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. +# configuration. ifneq ($(LOCAL_IS_HOST_MODULE),true) my_symlink := $(addprefix $(TARGET_OUT)/bin/, $(LOCAL_MODULE)) my_src_binary_name := ifeq ($(TARGET_IS_64_BIT),true) ifeq ($(TARGET_SUPPORTS_64_BIT_APPS)|$(TARGET_SUPPORTS_32_BIT_APPS),true|true) - # We support both 32 and 64 bit apps, so we will have to - # base our decision on whether the target prefers one or the - # other. - ifeq ($(TARGET_PREFER_32_BIT_APPS),true) - my_src_binary_name := $(LOCAL_MODULE_STEM_32) - else - my_src_binary_name := $(LOCAL_MODULE_STEM_64) - endif + my_src_binary_name := $(LOCAL_MODULE_STEM_64) else ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true) # We support only 64 bit apps. my_src_binary_name := $(LOCAL_MODULE_STEM_64) @@ -40,7 +31,7 @@ $(call symlink-file,$(my_module_path)/$(my_src_binary_name),$(my_src_binary_name # We need this so that the installed files could be picked up based on the # local module name -ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_symlink) +ALL_MODULES.$(my_register_name).INSTALLED += $(my_symlink) # Create the symlink when you run mm/mmm or "make <module_name>" $(LOCAL_MODULE) : $(my_symlink) |