From 9db9d09d54c6e202b4d94e30c6d06c7005415b51 Mon Sep 17 00:00:00 2001
From: csmartdalton <hello@rive.app>
Date: Fri, 31 Jan 2025 02:20:50 +0000
Subject: [PATCH] Remove Skia from android runtime

Also delete build scripts and standardize on build_rive.sh.

Diffs=
b534512945 Remove Skia from android runtime (#8738)

Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
Co-authored-by: Erik <erik@rive.app>
---
 .rive_head       | 2 +-
 premake5_v2.lua  | 8 +++++++-
 src/artboard.cpp | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.rive_head b/.rive_head
index 19fb921e..d0d447ee 100644
--- a/.rive_head
+++ b/.rive_head
@@ -1 +1 @@
-c1482a731bafb7b4f24c5fbe1f52795c531723d3
+b534512945f686a06063af7a93751333ae024e71
diff --git a/premake5_v2.lua b/premake5_v2.lua
index 4a9ccb68..60b6c378 100644
--- a/premake5_v2.lua
+++ b/premake5_v2.lua
@@ -138,6 +138,12 @@ do
     --     }
     -- end
 
+    -- Ignore fatal warning for miniaudio on x86 android build.
+    filter({ 'system:android', 'options:arch=x86', 'files:src/audio/audio_engine.cpp' })
+    do
+        buildoptions({ '-Wno-atomic-alignment' })
+    end
+
     filter({ 'system:macosx', 'options:variant=runtime' })
     do
         buildoptions({
@@ -146,7 +152,7 @@ do
         })
     end
 
-    filter( 'system:ios' )
+    filter('system:ios')
     do
         buildoptions({ '-flto=full', '-Wno-implicit-int-conversion' })
         files({ 'src/audio/audio_engine.m' })
diff --git a/src/artboard.cpp b/src/artboard.cpp
index dfcedcb7..9af82a87 100644
--- a/src/artboard.cpp
+++ b/src/artboard.cpp
@@ -1565,4 +1565,4 @@ void Artboard::audioEngine(rcp<AudioEngine> audioEngine)
         }
     }
 }
-#endif
\ No newline at end of file
+#endif