diff options
| author | Ying Wang <wangying@google.com> | 2014-11-24 22:17:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-24 22:17:57 +0000 |
| commit | 9f693b8f1e97fd8977d66e3bf003d7b9460be0e7 (patch) | |
| tree | 588059bff3d1afd08aa02093dccb1450336034fc | |
| parent | f3c8eb838db02a5fc215e178e4eb319831894d48 (diff) | |
| parent | 7d45be0e4aa034e7184464b9535d8a822110d58f (diff) | |
| download | system_core-9f693b8f1e97fd8977d66e3bf003d7b9460be0e7.zip system_core-9f693b8f1e97fd8977d66e3bf003d7b9460be0e7.tar.gz system_core-9f693b8f1e97fd8977d66e3bf003d7b9460be0e7.tar.bz2 | |
Merge "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 2f15f85..242c200 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -220,6 +220,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) @@ -233,22 +236,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) |