From d8315cd3a3197117a1514005fa0c9187603c8d08 Mon Sep 17 00:00:00 2001
From: Mis012 <Michael.Srba@seznam.cz>
Date: Thu, 24 Nov 2022 16:11:08 +0100
Subject: [PATCH] meson.build: make libtranslationlayer_main.so depend on
 libandroid.so to avoid confusing errors

---
 meson.build | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/meson.build b/meson.build
index 945173f1..b9e61955 100644
--- a/meson.build
+++ b/meson.build
@@ -23,6 +23,23 @@ marshal_files = gnome.genmarshal('marshal',
 	internal: true,
 )
 
+
+# libandroid
+libandroid_so = shared_library('android', [
+                          	'src/libandroid/asset_manager.c',
+                          	'src/libandroid/configuration.c',
+                          	'src/libandroid/input.c',
+                          	'src/libandroid/looper.c',
+                          	'src/libandroid/media.c',
+                          	'src/libandroid/native_window.c',
+                          	'src/libandroid/sensor.c',
+                          ],
+                          install: true,
+                          soversion: 0,
+                          dependencies: [
+                          	dependency('gtk4'), dependency('jni'), dependency('glfw3')
+                          ])
+
 libtranslationlayer_so = shared_library('translation_layer_main', [
                                                                   	'src/api-impl-jni/egl/com_google_android_gles_jni_EGLImpl.c',
                                                                   	'src/api-impl-jni/android_os_Environment.c',
@@ -52,6 +69,7 @@ libtranslationlayer_so = shared_library('translation_layer_main', [
                                                                   dependencies: [
                                                                   	dependency('gtk4'), dependency('gl'), dependency('egl'), dependency('wayland-client'), dependency('jni')
                                                                   ],
+                                                                  link_with: [ libandroid_so ],
                                                                   link_args: [
                                                                   	'-lasound'
                                                                   ])
@@ -68,22 +86,6 @@ executable('android-translation-layer', [
                    	'-rdynamic'
                    ])
 
-# libandroid
-shared_library('android', [
-                          	'src/libandroid/asset_manager.c',
-                          	'src/libandroid/configuration.c',
-                          	'src/libandroid/input.c',
-                          	'src/libandroid/looper.c',
-                          	'src/libandroid/media.c',
-                          	'src/libandroid/native_window.c',
-                          	'src/libandroid/sensor.c',
-                          ],
-                          install: true,
-                          soversion: 0,
-                          dependencies: [
-                          	dependency('gtk4'), dependency('jni'), dependency('glfw3')
-                          ])
-
 # hax_arsc_parser.dex (named as classes2.dex so it works inside a jar)
 subdir('src/arsc_parser')
 hax_arsc_parser_dex = custom_target('hax_arsc_parser.dex', build_by_default: true, input: [hax_arsc_parser_jar], output: ['classes2.dex'],