Generate efi.img on the fly

diff --git a/Android.mk b/Android.mk
index 14b1208..19970fd 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -75,6 +75,9 @@ $(boot_dir): $(shell find $(LOCAL_PATH)/boot -type f | sort -r) $(systemimg) $(I
        $(hide) rm -rf $@
        $(ACP) -pr $(dir $(<D)) $@
        $(ACP) -pr $(dir $(<D))../install/grub2/efi $@
+       img=$@/boot/grub/efi.img; dd if=/dev/zero of=$$img bs=1M count=4; \
+       mkdosfs -n EFI $$img; mmd -i $$img ::boot; \
+       mcopy -si $$img $@/efi ::; mdel -i $$img ::efi/boot/*.cfg
 
 BUILT_IMG := $(addprefix $(PRODUCT_OUT)/,ramdisk.img initrd.img install.img) $(systemimg)
 BUILT_IMG += $(if $(TARGET_PREBUILT_KERNEL),$(TARGET_PREBUILT_KERNEL),$(PRODUCT_OUT)/kernel)

diff --git a/boot/boot/grub/efi.img b/boot/boot/grub/efi.img
deleted file mode 100644 (file)
index d81e5a2..0000000
Binary files a/boot/boot/grub/efi.img and /dev/null differ