From d1d42e88dcbabb72d7834c3a7f986d7055e546bb Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Wed, 7 May 2014 12:41:24 +0800 Subject: [PATCH] executable_prefer_symlink: add makefile for creating symlink to prefer version For a 64bit target, we can have support for both 32bit and 64bit version binary(like app_process, dalvikvm), and there are some commands like am/pm will call these commands to implement it's function. In some targets it will prefer to use the 32bit version, and in other targets it will prefer to use the 64bit version. So this change is to add the common work for creating the symlink to the prefer version binary,and avoid the change on the caller commands side like am/pm. In this change, it uses TARGET_PREFER_32_BIT_APPS to decide linking to 32bit version or 64bit version. Change-Id: I96f041c0e0ededd953feead30ec63ad63e945a6f Signed-off-by: Yongqin Liu --- core/executable_prefer_symlink.mk | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 core/executable_prefer_symlink.mk diff --git a/core/executable_prefer_symlink.mk b/core/executable_prefer_symlink.mk new file mode 100644 index 000000000..c6abed417 --- /dev/null +++ b/core/executable_prefer_symlink.mk @@ -0,0 +1,25 @@ +# include this makefile to create the LOCAL_MODULE symlink to the primary version binary. +# but this requires the primary version name specified via LOCAL_MODULE_STEM_32 or LOCAL_MODULE_STEM_64, +# and different with the LOCAL_MODULE value +# +# 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 +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 + +$(my_symlink): $(LOCAL_INSTALLED_MODULE) $(LOCAL_MODULE_MAKEFILE) + @echo "Symlink: $@ -> $(PRIVATE_SRC_BINARY_NAME)" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf $(PRIVATE_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) + +my_symlink :=