| Revision | 7383df1fd3cde5f932ebd54a6776f5b5414edf9b (tree) |
|---|---|
| Zeit | 2020-03-13 12:44:32 |
| Autor | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/oreo-x86' into pie-x86
Android.mk
Android.mk (diff) initrd/init (diff)| @@ -14,7 +14,6 @@ | ||
| 14 | 14 | |
| 15 | 15 | ifneq ($(filter x86%,$(TARGET_ARCH)),) |
| 16 | 16 | LOCAL_PATH := $(call my-dir) |
| 17 | -include $(CLEAR_VARS) | |
| 18 | 17 | |
| 19 | 18 | include $(CLEAR_VARS) |
| 20 | 19 | LOCAL_IS_HOST_MODULE := true |
| @@ -84,6 +83,7 @@ BUILT_IMG += $(if $(TARGET_PREBUILT_KERNEL),$(TARGET_PREBUILT_KERNEL),$(PRODUCT_ | ||
| 84 | 83 | |
| 85 | 84 | GENISOIMG := $(if $(shell which xorriso 2> /dev/null),xorriso -as mkisofs,genisoimage) |
| 86 | 85 | ISO_IMAGE := $(PRODUCT_OUT)/$(TARGET_PRODUCT).iso |
| 86 | +ISOHYBRID := LD_LIBRARY_PATH=$(LOCAL_PATH)/install/lib external/syslinux/bios/utils/isohybrid | |
| 87 | 87 | $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG) |
| 88 | 88 | @echo ----- Making iso image ------ |
| 89 | 89 | $(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) | ||
| 92 | 92 | $(GENISOIMG) -vJURT -b isolinux/isolinux.bin -c isolinux/boot.cat \ |
| 93 | 93 | -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot \ |
| 94 | 94 | -input-charset utf-8 -V "$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86) $(VER) ($(TARGET_ARCH))" -o $@ $^ |
| 95 | - $(hide) external/syslinux/bios/utils/isohybrid.pl $@ | |
| 95 | + $(hide) $(ISOHYBRID) --uefi $@ | |
| 96 | 96 | @echo -e "\n\n$@ is built successfully.\n\n" |
| 97 | 97 | |
| 98 | 98 | rpm: $(wildcard $(LOCAL_PATH)/rpm/*) $(BUILT_IMG) |
| @@ -113,10 +113,10 @@ check_root() | ||
| 113 | 113 | elif [ -e /mnt/$SRC/system.img ]; then |
| 114 | 114 | remount_rw |
| 115 | 115 | mount -o loop,noatime /mnt/$SRC/system.img system |
| 116 | - elif [ -d /mnt/$SRC/system ]; then | |
| 116 | + elif [ -s /mnt/$SRC/system/build.prop ]; then | |
| 117 | 117 | remount_rw |
| 118 | 118 | mount --bind /mnt/$SRC/system system |
| 119 | - elif [ -z "$SRC" -a -e /mnt/build.prop ]; then | |
| 119 | + elif [ -z "$SRC" -a -s /mnt/build.prop ]; then | |
| 120 | 120 | mount --bind /mnt system |
| 121 | 121 | else |
| 122 | 122 | rm -rf * |
Android-x86
Fork