fix: #30 BusError when running 32b binary on armv8 with compatibility (#32)

When a 32-bit Android system runs on an ARMv8 device, Android reports to
apps that only 32-bit ABIs are supported. As a result, the ARMv7
binary is selected.

Although ARMv8 provides a compatibility mode for 32-bit binaries, this
mode is stricter than native ARMv7 execution, especially regarding
memory alignment and structure layout.

The modifications made to the C++ structures in apktool introduced a
memory misalignment, which is tolerated on ARMv7 but triggers a BusError
on ARMv8 in 32-bit compatibility mode.

Author: Taknok

patch.sh

@@ -21,4 +21,7 @@ sed -i "$ressourcesPattern" "submodules/base/tools/aapt2/ResourcesInternal.proto
 git apply "patches/apktool_ibotpeaches.patch"
 git apply "patches/protobuf.patch"
 
+# Fix BusError when executing a 32b binary on a armv8 with compatibility mode
+git apply "patches/32bsystem_on_armv8.patch"
+
 ln -sf "submodules/googletest" "submodules/boringssl/src/third_party/googletest"

patches/32bsystem_on_armv8.patch

@@ -0,0 +1,13 @@
+diff --git a/submodules/base/libs/androidfw/include/androidfw/ResourceTypes.h b/submodules/base/libs/androidfw/include/androidfw/ResourceTypes.h
+index c26489093..7fb0c4e99 100644
+--- a/submodules/base/libs/androidfw/include/androidfw/ResourceTypes.h
++++ b/submodules/base/libs/androidfw/include/androidfw/ResourceTypes.h
+@@ -505,7 +505,7 @@ struct ResStringPool_span
+
+     // The range of characters in the string that this span applies to.
+     uint32_t firstChar, lastChar;
+-};
++} __attribute__((__packed__, aligned(1)));
+
+ /**
+  * Convenience class for accessing data in a ResStringPool resource.