• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

bootable/newinstaller


Commit MetaInfo

Revision0f1d057fb944c76de1f5a1b6611c5cac63614726 (tree)
Time2020-03-13 01:17:10
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Use isohybrid in AOSP's tree

This removes the dependency of an external host tool.

Change Summary

Incremental Difference

--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,6 @@
1414
1515 ifneq ($(filter x86%,$(TARGET_ARCH)),)
1616 LOCAL_PATH := $(call my-dir)
17-include $(CLEAR_VARS)
1817
1918 include $(CLEAR_VARS)
2019 LOCAL_IS_HOST_MODULE := true
@@ -84,6 +83,7 @@ BUILT_IMG += $(if $(TARGET_PREBUILT_KERNEL),$(TARGET_PREBUILT_KERNEL),$(PRODUCT_
8483
8584 GENISOIMG := $(if $(shell which xorriso 2> /dev/null),xorriso -as mkisofs,genisoimage)
8685 ISO_IMAGE := $(PRODUCT_OUT)/$(TARGET_PRODUCT).iso
86+ISOHYBRID := LD_LIBRARY_PATH=$(LOCAL_PATH)/install/lib external/syslinux/bios/utils/isohybrid
8787 $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG)
8888 @echo ----- Making iso image ------
8989 $(hide) sed -i "s|\(Installation CD\)\(.*\)|\1 $(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $</isolinux/isolinux.cfg
@@ -92,7 +92,7 @@ $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG)
9292 $(GENISOIMG) -vJURT -b isolinux/isolinux.bin -c isolinux/boot.cat \
9393 -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot \
9494 -input-charset utf-8 -V "$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86) $(VER) ($(TARGET_ARCH))" -o $@ $^
95- $(hide) isohybrid --uefi $@ || echo -e "isohybrid not found.\nInstall syslinux 4.0 or higher if you want to build a usb bootable iso."
95+ $(hide) $(ISOHYBRID) --uefi $@
9696 @echo -e "\n\n$@ is built successfully.\n\n"
9797
9898 rpm: $(wildcard $(LOCAL_PATH)/rpm/*) $(BUILT_IMG)