diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2015-03-09 19:58:54 +0100 |
|---|---|---|
| committer | Dees Troy <dees_troy@teamw.in> | 2015-03-13 17:20:57 +0100 |
| commit | 4f6a9762123126fcfbd2f1b52755565531d96c30 (patch) | |
| tree | 76e2e02159197c3f4086dd658246de0f04098eac | |
| parent | GUI: Add monospace TTF (diff) | |
| download | android_bootable_recovery-4f6a9762123126fcfbd2f1b52755565531d96c30.tar android_bootable_recovery-4f6a9762123126fcfbd2f1b52755565531d96c30.tar.gz android_bootable_recovery-4f6a9762123126fcfbd2f1b52755565531d96c30.tar.bz2 android_bootable_recovery-4f6a9762123126fcfbd2f1b52755565531d96c30.tar.lz android_bootable_recovery-4f6a9762123126fcfbd2f1b52755565531d96c30.tar.xz android_bootable_recovery-4f6a9762123126fcfbd2f1b52755565531d96c30.tar.zst android_bootable_recovery-4f6a9762123126fcfbd2f1b52755565531d96c30.zip | |
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | minuitwrp/graphics.c | 9 | ||||
| -rw-r--r-- | prebuilt/Android.mk | 7 |
3 files changed, 18 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index e76a3a91f..ddd2c7ded 100644 --- a/Android.mk +++ b/Android.mk @@ -323,7 +323,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \ mkdosfs ifneq ($(TARGET_ARCH), arm64) - LOCAL_LDFLAGS += -Wl,-dynamic-linker,/sbin/linker + ifneq ($(TARGET_ARCH), x86_64) + LOCAL_LDFLAGS += -Wl,-dynamic-linker,/sbin/linker + else + LOCAL_LDFLAGS += -Wl,-dynamic-linker,/sbin/linker64 + endif else LOCAL_LDFLAGS += -Wl,-dynamic-linker,/sbin/linker64 endif diff --git a/minuitwrp/graphics.c b/minuitwrp/graphics.c index 10d74a7a7..1465ce99b 100644 --- a/minuitwrp/graphics.c +++ b/minuitwrp/graphics.c @@ -163,12 +163,17 @@ int getFbYres (void) { static int get_framebuffer(GGLSurface *fb) { - int fd; + int fd, index = 0; void *bits; fd = open("/dev/graphics/fb0", O_RDWR); + while (fd < 0 && index < 10) { + usleep(1000); + fd = open("/dev/graphics/fb0", O_RDWR); + index++; + } if (fd < 0) { - perror("cannot open fb0"); + perror("cannot open fb0\n"); return -1; } diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 9ff304cd8..07e24e39e 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -26,7 +26,12 @@ RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/mkdosfs RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/e2fsck RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mke2fs RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/tune2fs -RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/linker +ifneq ($(TARGET_ARCH), x86_64) + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/linker +endif +ifeq ($(TARGET_ARCH), x86_64) + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/linker64 +endif ifeq ($(TARGET_ARCH), arm64) RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/linker64 endif |