From 6f406aab035bcce1bc0a4524595fe5739cf9249e Mon Sep 17 00:00:00 2001 From: "Koushik K. Dutta" Date: Tue, 16 Mar 2010 23:46:13 -0700 Subject: [PATCH] Move the symlink creation into recovery, rather than in the hacky build/core/Makefile --- Android.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Android.mk b/Android.mk index 2a915d4..2c9dbff 100644 --- a/Android.mk +++ b/Android.mk @@ -50,6 +50,30 @@ LOCAL_STATIC_LIBRARIES += libstdc++ libc include $(BUILD_EXECUTABLE) +RECOVERY_LINKS := amend busybox flash_image dump_image mkyaffs2image unyaffs +# nc is provided by external/netcat +SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(RECOVERY_LINKS)) +$(SYMLINKS): RECOVERY_BINARY := $(LOCAL_MODULE) +$(SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Symlink: $@ -> $(RECOVERY_BINARY)" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf $(RECOVERY_BINARY) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(SYMLINKS) + +# Now let's do recovery symlinks +BUSYBOX_LINKS := $(shell cat external/busybox/busybox.links) +SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(filter-out $(exclude),$(notdir $(BUSYBOX_LINKS)))) +$(SYMLINKS): BUSYBOX_BINARY := busybox +$(SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Symlink: $@ -> $(BUSYBOX_BINARY)" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf $(BUSYBOX_BINARY) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(SYMLINKS) + include $(commands_recovery_local_path)/amend/Android.mk include $(commands_recovery_local_path)/minui/Android.mk include $(commands_recovery_local_path)/minzip/Android.mk