Commit: fe7a5f63c09acfc8d3fd81e86baff366a35f2ace - bootable-newinstaller (git)

bootable/newinstaller

Commit MetaInfo

• Revision: fe7a5f63c09acfc8d3fd81e86baff366a35f2ace (tree)
• Time: 2019-10-05 19:37:18
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Use isohybrid.pl in AOSP's tree

This removes the dependency of an external host tool.

Change Summary

• modified: Android.mk

Incremental Difference

--- a/Android.mk
+++ b/Android.mk
@@ -92,7 +92,7 @@ $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG)
 	$(GENISOIMG) -vJURT -b isolinux/isolinux.bin -c isolinux/boot.cat \
 		-no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot \
 		-input-charset utf-8 -V "$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86) LiveCD" -o $@ $^
-	$(hide) isohybrid --uefi $@ || echo -e "isohybrid not found.\nInstall syslinux 4.0 or higher if you want to build a usb bootable iso."
+	$(hide) external/syslinux/bios/utils/isohybrid.pl $@
 	@echo -e "\n\n$@ is built successfully.\n\n"
 
 rpm: $(wildcard $(LOCAL_PATH)/rpm/*) $(BUILT_IMG)