resolved conflicts for merge of da92aef7 to master

#

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

    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

  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)"

# 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 :=