diff options
| author | Ying Wang <wangying@google.com> | 2014-11-25 19:03:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 19:03:21 +0000 |
| commit | b14bc39b36d4d4901b229577f5f312549bb2e953 (patch) | |
| tree | b8da3e0dd835f734afde97798ac559f5897a9e94 | |
| parent | 59acfee63f77b23c1a1bcc5fd869c5cb2db8e4ea (diff) | |
| parent | 9f693b8f1e97fd8977d66e3bf003d7b9460be0e7 (diff) | |
| download | system_core-b14bc39b36d4d4901b229577f5f312549bb2e953.zip system_core-b14bc39b36d4d4901b229577f5f312549bb2e953.tar.gz system_core-b14bc39b36d4d4901b229577f5f312549bb2e953.tar.bz2 | |
am 9f693b8f: Merge "Use LOCAL_POST_LINK_CMD to install toolbox symlinks"
* commit '9f693b8f1e97fd8977d66e3bf003d7b9460be0e7':
Use LOCAL_POST_LINK_CMD to install toolbox symlinks
| -rw-r--r-- | toolbox/Android.mk | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/toolbox/Android.mk b/toolbox/Android.mk index c170d46..ea9afb6 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -221,6 +221,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := $(patsubst %,libtoolbox_%,$(BSD_TOOLS)) LOCAL_MODULE := toolbox LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +# Install the symlinks. +LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toolbox $(TARGET_OUT)/bin/$(t);) + # Including this will define $(intermediates). # include $(BUILD_EXECUTABLE) @@ -234,22 +237,6 @@ $(TOOLS_H): $(LOCAL_PATH)/Android.mk $(TOOLS_H): $(transform-generated-source) -# Make symbolic link launchers for each tool. -SYMLINKS := $(addprefix $(TARGET_OUT)/bin/,$(ALL_TOOLS)) -$(SYMLINKS): TOOLBOX_BINARY := $(LOCAL_MODULE) -$(SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk - @echo "Symlink: $@ -> $(TOOLBOX_BINARY)" - @mkdir -p $(dir $@) - @rm -rf $@ - $(hide) ln -sf $(TOOLBOX_BINARY) $@ - -ALL_DEFAULT_INSTALLED_MODULES += $(SYMLINKS) - -# We need this so that the installed files could be picked up based on the -# local module name -ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \ - $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(SYMLINKS) - # We only want 'r' on userdebug and eng builds. include $(CLEAR_VARS) |