diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-28 13:49:26 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-06-28 13:54:24 -0700 |
| commit | 191e5988d077007e42e1706810c0999abd35ca8d (patch) | |
| tree | 29bd71e2764b576cf48d11c5f55965ac63783757 /core/executable_prefer_symlink.mk | |
| parent | 8d43e17bfdf7fb9bd22d02665005f226d9d35a81 (diff) | |
| parent | da92aef762fbdf60245746932354998515b68d57 (diff) | |
| download | build-191e5988d077007e42e1706810c0999abd35ca8d.zip build-191e5988d077007e42e1706810c0999abd35ca8d.tar.gz build-191e5988d077007e42e1706810c0999abd35ca8d.tar.bz2 | |
resolved conflicts for merge of da92aef7 to master
Change-Id: I70b608d48b0e7cfea3d970101769c156a211f861
Diffstat (limited to 'core/executable_prefer_symlink.mk')
| -rw-r--r-- | core/executable_prefer_symlink.mk | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/core/executable_prefer_symlink.mk b/core/executable_prefer_symlink.mk index fa49e40..e4df92e 100644 --- a/core/executable_prefer_symlink.mk +++ b/core/executable_prefer_symlink.mk @@ -4,33 +4,41 @@ # # 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. -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. - ifneq ($(TARGET_PREFER_32_BIT_APPS),true) - $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32) +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 + # base our decision on whether the target prefers one or the + # 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 - $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_64) + $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32) 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 - $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32) + 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)" @mkdir -p $(dir $@) @@ -41,4 +49,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 := |