diff --git a/.rive_head b/.rive_head
index 344c9b1..c23dda5 100644
--- a/.rive_head
+++ b/.rive_head
@@ -1 +1 @@
-f6d19cc2449cb487ff0bb007817d5e77fe117380
+9b75cdb96c2e7dc1f15551cbbf3e0f320759c078
diff --git a/out/premake5_pls_renderer.lua b/out/premake5_pls_renderer.lua
index abb78aa..dd3e22b 100644
--- a/out/premake5_pls_renderer.lua
+++ b/out/premake5_pls_renderer.lua
@@ -135,11 +135,34 @@
 
     filter "system:android"
     do
-        targetdir "android_%{cfg.buildcfg}"
-        objdir "obj/android_%{cfg.buildcfg}"
+
         files {"../renderer/gl/load_gles_extensions.cpp",
                "../renderer/gl/pls_impl_ext_native.cpp",
                "../renderer/gl/pls_impl_framebuffer_fetch.cpp"}
+
+        filter {'system:android', 'options:arch=x86'}
+        do
+            targetdir '%{cfg.system}/x86/%{cfg.buildcfg}/lib'
+            objdir '%{cfg.system}/x86/%{cfg.buildcfg}/obj'
+        end
+
+        filter {'system:android', 'options:arch=x64'}
+        do
+            targetdir '%{cfg.system}/x64/%{cfg.buildcfg}/lib'
+            objdir '%{cfg.system}/x64/%{cfg.buildcfg}/obj'
+        end
+
+        filter {'system:android', 'options:arch=arm'}
+        do
+            targetdir '%{cfg.system}/arm/%{cfg.buildcfg}/lib'
+            objdir '%{cfg.system}/arm/%{cfg.buildcfg}/obj'
+        end
+
+        filter {'system:android', 'options:arch=arm64'}
+        do
+            targetdir '%{cfg.system}/arm64/%{cfg.buildcfg}/lib'
+            objdir '%{cfg.system}/arm64/%{cfg.buildcfg}/obj'
+        end
     end
 
     filter {"system:macosx or ios", "options:not nop-obj-c"}
@@ -224,3 +247,15 @@
     },
     default = 'system'
 }
+
+newoption {
+    trigger = 'arch',
+    value = 'ABI',
+    description = 'The ABI with the right toolchain for this build, generally with Android',
+    allowed = {
+        {'x86'},
+        {'x64'},
+        {'arm'},
+        {'arm64'}
+    }
+}