bbootimg: Build the host package as a 32bits standalone package

* Built as 32bits all the time for compatibility * Avoids libc++ dependencies Change-Id: Ie2512e3d15412fceea5929a6aad06bbe18a3c911
Tasssadar · Jun 11, 2017 · f46ee83 · f46ee83
1 parent cad27ec
commit f46ee83
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Android.mk b/Android.mk
@@ -26,6 +26,10 @@ LOCAL_MODULE := bbootimge_host
 LOCAL_MODULE_STEM := bbootimg
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_32_BIT_ONLY := true
+LOCAL_CXX_STL := libc++_static
+LOCAL_FORCE_STATIC_EXECUTABLE := true
+
 include $(BUILD_HOST_EXECUTABLE)
 
 # bbootimg - dynamic binary for TWRP

diff --git a/src/bbootimg.c b/src/bbootimg.c
@@ -295,7 +295,7 @@ static int print_info(const char *path)
     printf ("  page size  = %u bytes\n\n", img.hdr.page_size);
 
     printf ("* Boot Name = \"%s\" [ ", name);
-    for (i = 0; i < BOOT_NAME_SIZE && name[i] != '\0'; i++)
+    for (i = 0; i < BOOT_NAME_SIZE && name[i] != '\0'; ++i)
     {
         printf ("0x%02X ", name[i]);
     }