ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Use LOCAL_POST_LINK_CMD to install toolbox symlinks"

Browse source
This commit is contained in:
Ying Wang 2014-11-24 22:17:54 +00:00 • committed by Gerrit Code Review
commit 9f693b8f1e
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
toolbox/Android.mk
View file

@ -220,6 +220,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := $(patsubst %,libtoolbox_%,$(BSD_TOOLS))
LOCAL_MODULE := toolbox LOCAL_MODULE := toolbox
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk 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). # Including this will define $(intermediates).
# #
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
@ -233,22 +236,6 @@ $(TOOLS_H): $(LOCAL_PATH)/Android.mk
$(TOOLS_H): $(TOOLS_H):
$(transform-generated-source) $(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. # We only want 'r' on userdebug and eng builds.
include $(CLEAR_VARS) include $(CLEAR_VARS)