diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-10 14:18:38 +0100 |
|---|---|---|
| committer | Tom Marshall <tdm@cyngn.com> | 2015-11-20 15:46:40 -0800 |
| commit | 7eee7c2e8c653f41871b98e27b6fcbbed50e5bb8 (patch) | |
| tree | 1158a4e25a426a78f572895e6ed52e11eb92f490 /Android.mk | |
| parent | 9dc02b1f906832f2e741d7a73469e1f874dd52da (diff) | |
| download | bootable_recovery-7eee7c2e8c653f41871b98e27b6fcbbed50e5bb8.zip bootable_recovery-7eee7c2e8c653f41871b98e27b6fcbbed50e5bb8.tar.gz bootable_recovery-7eee7c2e8c653f41871b98e27b6fcbbed50e5bb8.tar.bz2 | |
sr: Add fstools, update build configuration
* Make sure we create any dirs before trying to put symlinks in them
* Create a new "fstools" target which aggregates all of our filesystem
tools into a single multi-call binary. This reduces the overall
recovery image size by a megabyte, and also removes GPL code from the
main recovery binary.
Change-Id: I5fc2a61d564915085071ccbbcb3136f45c640a60
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -113,15 +113,9 @@ endif LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_C_INCLUDES += external/boringssl/include -# Symlinks -RECOVERY_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(RECOVERY_LINKS)) - ifeq ($(ONE_SHOT_MAKEFILE),) LOCAL_ADDITIONAL_DEPENDENCIES += \ - mount.exfat_static \ - recovery_e2fsck \ - recovery_mke2fs \ - recovery_tune2fs \ + fstools \ recovery_mkshrc endif @@ -138,11 +132,12 @@ LOCAL_POST_INSTALL_CMD := \ include $(BUILD_EXECUTABLE) # Run toybox-instlist and generate the rest of the symlinks -toybox_recovery_links: $(TOYBOX_INSTLIST) +toybox_recovery_links: $(TOYBOX_INSTLIST) recovery toybox_recovery_links: TOY_LIST=$(shell $(TOYBOX_INSTLIST)) toybox_recovery_links: TOYBOX_BINARY := $(TARGET_RECOVERY_ROOT_OUT)/sbin/toybox toybox_recovery_links: @echo -e ${CL_CYN}"Generate Toybox links:"${CL_RST} $(TOY_LIST) + @mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin $(hide) $(foreach t,$(TOY_LIST),ln -sf toybox $(TARGET_RECOVERY_ROOT_OUT)/sbin/$(t);) # mkshrc @@ -236,6 +231,7 @@ include $(LOCAL_PATH)/minui/Android.mk \ $(LOCAL_PATH)/edify/Android.mk \ $(LOCAL_PATH)/uncrypt/Android.mk \ $(LOCAL_PATH)/updater/Android.mk \ - $(LOCAL_PATH)/applypatch/Android.mk + $(LOCAL_PATH)/applypatch/Android.mk \ + $(LOCAL_PATH)/fstools/Android.mk endif |