diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-14 18:26:48 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-05-14 18:26:48 +0100 |
| commit | 4fb8122bcb6870babd55444d32899f3d591a837d (patch) | |
| tree | d854b7ca138d80820ba07f9fed8563c5128f922c /core/executable_prefer_symlink.mk | |
| parent | b082b5f1b2d1a45ee91de186428d5e341d02c08a (diff) | |
| download | build-4fb8122bcb6870babd55444d32899f3d591a837d.zip build-4fb8122bcb6870babd55444d32899f3d591a837d.tar.gz build-4fb8122bcb6870babd55444d32899f3d591a837d.tar.bz2 | |
Fix executable symlinks.
32 bit targets will leave TARGET_PREFER_{32,64}_BIT_APPS unset
so adjust accordingly. Also clean up an explanatory comment.
Change-Id: I1f6faa640e4e862631fff49f7c565766ef2c567f
Diffstat (limited to 'core/executable_prefer_symlink.mk')
| -rw-r--r-- | core/executable_prefer_symlink.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/executable_prefer_symlink.mk b/core/executable_prefer_symlink.mk index c6abed4..2f04d0d 100644 --- a/core/executable_prefer_symlink.mk +++ b/core/executable_prefer_symlink.mk @@ -5,12 +5,20 @@ # 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 +# 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) 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 +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)" |