tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolved conflicts for merge of da92aef7 to master

Browse source 
Change-Id: I70b608d48b0e7cfea3d970101769c156a211f861
This commit is contained in:
Brian Carlstrom 2014-06-28 13:49:26 -07:00
commit 191e5988d0
1 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
core/executable_prefer_symlink.mk
View file

@ -4,32 +4,40 @@
# #
# Note: now only limited to the binaries that will be installed under system/bin directory # 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 # Create link to the one used depending on the target
# configuration. Note that we require the TARGET_IS_64_BIT # configuration. Note that we require the TARGET_IS_64_BIT
# check because 32 bit targets may not define TARGET_PREFER_32_BIT_APPS # check because 32 bit targets may not define TARGET_PREFER_32_BIT_APPS
# et al. since those variables make no sense in that context. # et al. since those variables make no sense in that context.
ifeq ($(TARGET_IS_64_BIT),true) ifneq ($(LOCAL_IS_HOST_MODULE),true)
ifeq ($(TARGET_SUPPORTS_64_BIT_APPS)|$(TARGET_SUPPORTS_32_BIT_APPS),true|true) my_symlink := $(addprefix $(TARGET_OUT)/bin/, $(LOCAL_MODULE))
# We support both 32 and 64 bit apps, so we will have to ifeq ($(TARGET_IS_64_BIT),true)
# base our decision on whether the target prefers one or the ifeq ($(TARGET_SUPPORTS_64_BIT_APPS)|$(TARGET_SUPPORTS_32_BIT_APPS),true|true)
# other. # We support both 32 and 64 bit apps, so we will have to
ifneq ($(TARGET_PREFER_32_BIT_APPS),true) # base our decision on whether the target prefers one or the
$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32) # other.
ifneq ($(TARGET_PREFER_32_BIT_APPS),true)
$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32)
else
$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_64)
endif
else ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true)
# We support only 64 bit apps.
$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_64)
else
# We support only 32 bit apps.
$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32)
endif
else else
$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_64) $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32)
endif endif
else ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true)
# We support only 64 bit apps.
$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_64)
else else
# We support only 32 bit apps. my_symlink := $(addprefix $(HOST_OUT)/bin/, $(LOCAL_MODULE))
$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32) 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 endif
else
$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32)
endif
$(my_symlink): $(LOCAL_INSTALLED_MODULE) $(LOCAL_MODULE_MAKEFILE) $(my_symlink): $(LOCAL_INSTALLED_MODULE) $(LOCAL_MODULE_MAKEFILE)
@echo "Symlink: $@ -> $(PRIVATE_SRC_BINARY_NAME)" @echo "Symlink: $@ -> $(PRIVATE_SRC_BINARY_NAME)"
@ -41,4 +49,7 @@ $(my_symlink): $(LOCAL_INSTALLED_MODULE) $(LOCAL_MODULE_MAKEFILE)
# local module name # local module name
ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_symlink) 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 := my_symlink :=