fix: also use keyutils on android

Author: Totto16

src/lobby/credentials/secret.cpp

@@ -1,7 +1,7 @@
 
 #include "./secret.hpp"
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__ANDROID__)
 
 #include <core/helper/utils.hpp>
 #include <fmt/format.h>
@@ -165,27 +165,6 @@ secret::SecretStorage::store(const std::string& key, const std::string& value, b
 }
 
 
-[[nodiscard]] std::optional<std::string> secret::SecretStorage::remove(const std::string& key) const {
-    return std::nullopt;
-}
-
-
-#elif defined(__ANDROID__)
-//TODO: use https://developer.android.com/privacy-and-security/keystore
-
-secret::SecretStorage::SecretStorage(KeyringType type) : m_type{ type } { }
-
-
-[[nodiscard]] helper::expected<std::string, std::string> secret::SecretStorage::load(const std::string& key) const {
-    return result_string;
-}
-
-[[nodiscard]] std::optional<std::string>
-secret::SecretStorage::store(const std::string& key, const std::string& value, bool update) const {
-    return std::nullopt;
-}
-
-
 [[nodiscard]] std::optional<std::string> secret::SecretStorage::remove(const std::string& key) const {
     return std::nullopt;
 }

src/lobby/credentials/secret.hpp

@@ -20,7 +20,7 @@ namespace secret {
     private:
         KeyringType m_type;
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__ANDROID__)
         key_serial_t m_ring_id;
 #elif defined(__CONSOLE__) || defined(__APPLE__)
         std::string m_file_path;

tools/dependencies/meson.build

@@ -280,7 +280,7 @@ if build_application
 
     endif
 
-    if host_machine.system() == 'linux'
+    if host_machine.system() == 'linux' or (meson.is_cross_build() and host_machine.system() == 'android')
         keyutils_dep = dependency('keyutils', required: true, allow_fallback: true)
         graphics_lib += {'deps': [graphics_lib.get('deps'), keyutils_dep]}
     endif