Skip to content

Commit f46ee83

Browse files
committed
bbootimg: Build the host package as a 32bits standalone package
* Built as 32bits all the time for compatibility * Avoids libc++ dependencies Change-Id: Ie2512e3d15412fceea5929a6aad06bbe18a3c911
1 parent cad27ec commit f46ee83

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

Android.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ LOCAL_MODULE := bbootimge_host
2626
LOCAL_MODULE_STEM := bbootimg
2727
LOCAL_MODULE_TAGS := optional
2828

29+
LOCAL_32_BIT_ONLY := true
30+
LOCAL_CXX_STL := libc++_static
31+
LOCAL_FORCE_STATIC_EXECUTABLE := true
32+
2933
include $(BUILD_HOST_EXECUTABLE)
3034

3135
# bbootimg - dynamic binary for TWRP

src/bbootimg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ static int print_info(const char *path)
295295
printf (" page size = %u bytes\n\n", img.hdr.page_size);
296296

297297
printf ("* Boot Name = \"%s\" [ ", name);
298-
for (i = 0; i < BOOT_NAME_SIZE && name[i] != '\0'; i++)
298+
for (i = 0; i < BOOT_NAME_SIZE && name[i] != '\0'; ++i)
299299
{
300300
printf ("0x%02X ", name[i]);
301301
}

0 commit comments

Comments
 (0)