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 <[email protected]> Co-authored-by: Erik <[email protected]>
rive-app · Jan 31, 2025 · 9db9d09 · 9db9d09
1 parent 2e8d8ff
commit 9db9d09
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.rive_head b/.rive_head
@@ -1 +1 @@
-c1482a731bafb7b4f24c5fbe1f52795c531723d3
+b534512945f686a06063af7a93751333ae024e71
diff --git 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
@@ -1565,4 +1565,4 @@ void Artboard::audioEngine(rcp<AudioEngine> audioEngine)
         }
     }
 }
-#endif
+#endif
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c1482a731bafb7b4f24c5fbe1f52795c531723d3
		b534512945f686a06063af7a93751333ae024e71
-Original file line number
+Diff line change
@@ Expand Up / @@ -1565,4 +1565,4 @@ void Artboard::audioEngine(rcp<AudioEngine> audioEngine) @@
             }
         }
     }
-    #endif
+    #endif