feat: add proper android support for discord social sdk

Author: Totto16

platforms/android/app/build.gradle

@@ -159,19 +159,19 @@ String getVersion() {
 
         if (versionResult.getV3() != 0) {
             throw new Exception(
-                    'An error occured while trying to detect the version: process exited with exit code: ' +
+                    'An error occurred while trying to detect the version: process exited with exit code: ' +
                             versionResult.getV3() +
                             ' and stderr:\n' +
                             versionResult.getV2().join("\n")
             );
         }
 
         if (versionResult.getV2() != null && !versionResult.getV2().isEmpty()) {
-            throw new Exception('An error occured while trying to detect the version (code 1): ' + versionResult.getV2().join("\n"));
+            throw new Exception('An error occurred while trying to detect the version (code 1): ' + versionResult.getV2().join("\n"));
         }
 
         if (versionResult.getV1() == null || versionResult.getV1().size() != 1) {
-            throw new Exception('An error occured while trying to detect the version (code 2): ' + versionResult.getV1().join("\n"));
+            throw new Exception('An error occurred while trying to detect the version (code 2): ' + versionResult.getV1().join("\n"));
         }
 
         String version = versionResult.getV1()[0];
@@ -182,7 +182,7 @@ String getVersion() {
 
         for (version1 in versions) {
             if (version != version1) {
-                throw new Exception("Recievd two versions, that didn't match: " + version1 + " != " + version);
+                throw new Exception("Received two versions, that didn't match: " + version1 + " != " + version);
             }
         }
 
@@ -192,7 +192,7 @@ String getVersion() {
 
 
     if (versions.size() == 0) {
-        throw new Exception("ERROR: at least one version has to be detected (at least one abi has to be returend by 'getAndroidABIs()')");
+        throw new Exception("ERROR: at least one version has to be detected (at least one abi has to be returned by 'getAndroidABIs()')");
     }
 
     // we guarantee, that every string in there is the same, and that it has at least one entry 
@@ -224,7 +224,81 @@ Boolean shouldBuildUniversalApk(List<String> abisToUse) {
 
     return true;
 
+}
+
+
+/**
+ * get the meson build type
+ * @return String
+ */
+String getMesonBuildType() {
+    List<String> abis = getAndroidABIs();
+    List<String> buildtypes = new ArrayList<String>();
+
+    for (abi in abis) {
+        File abiDir = getABIDir(abi);
+
+        Tuple3<List<String>, List<String>, Integer> buildtypeResult = executePipeline(Arrays.asList(
+                Arrays.asList("meson", "introspect", "--buildoptions", abiDir.getAbsolutePath()),
+                Arrays.asList("jq", "-r", ".[] | select(.name == \"buildtype\") | .value")
+        ));
+
+        if (buildtypeResult.getV3() != 0) {
+            throw new Exception(
+                    'An error occurred while trying to detect the buildtype: process exited with exit code: ' +
+                            buildtypeResult.getV3() +
+                            ' and stderr:\n' +
+                            buildtypeResult.getV2().join("\n")
+            );
+        }
+
+        if (buildtypeResult.getV2() != null && !buildtypeResult.getV2().isEmpty()) {
+            throw new Exception('An error occurred while trying to detect the buildtype (code 1): ' + buildtypeResult.getV2().join("\n"));
+        }
+
+        if (buildtypeResult.getV1() == null || buildtypeResult.getV1().size() != 1) {
+            throw new Exception('An error occurred while trying to detect the buildtype (code 2): ' + buildtypeResult.getV1().join("\n"));
+        }
+
+        String buildtype = buildtypeResult.getV1()[0];
 
+        if (buildtype == "") {
+            throw new Exception("Auto detection of buildtype returned invalid buildtype: '" + version + "'");
+        }
+
+        for (buildtype1 in buildtypes) {
+            if (buildtype != buildtype1) {
+                throw new Exception("Received two buildtypes, that didn't match: " + buildtype1 + " != " + buildtype);
+            }
+        }
+
+        buildtypes.add(buildtype);
+
+    }
+
+
+    if (buildtypes.size() == 0) {
+        throw new Exception("ERROR: at least one buildtype has to be detected (at least one abi has to be returned by 'getAndroidABIs()')");
+    }
+
+    // we guarantee, that every string in there is the same, and that it has at least one entry 
+    return buildtypes[0];
+
+}
+
+/**
+ * Returns the aar file for discord
+ * @return File
+ */
+File getDiscordLib() {
+    String target = getMesonBuildType() == 'release' ? 'release' : 'debug'
+    String path = "../../../../subprojects/discord_social_sdk/lib/" + target + "/discord_partner_sdk.aar";
+    File file = project.file(project.getLayout().getBuildDirectory().file(path));
+    if(!file.exists()){
+        throw new Exception("ERROR: discord aar is not present at the location we expected it to be!")
+    }
+
+    return file;
 }
 
 
@@ -315,4 +389,5 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation files(getDiscordLib())
 }

platforms/android/app/src/main/java/com/github/oopetris/MainActivity.java

@@ -1,10 +1,17 @@
 package com.github.oopetris;
 
 import org.libsdl.app.SDLActivity;
+import com.discord.socialsdk.DiscordSocialSdkInit;
+import android.os.Bundle;
 
-/**
- * A sample wrapper class that just calls SDLActivity 
- */
+public class MainActivity extends SDLActivity { 
 
-public class MainActivity extends SDLActivity { }
+    // Setup
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        DiscordSocialSdkInit.setEngineActivity(this);
+    }
+
+}
 

src/discord/core.hpp

@@ -27,7 +27,7 @@ namespace constants::discord {
 
 //TODO(Totto):  this isn't correct for all platforms and needs to be tested
 #if defined(__ANDROID__)
-#error "Not supported"
+    constexpr const char* platform_dependent_launch_arguments = "TODO";
 #elif defined(__CONSOLE__)
 #error "Not supported"
 #elif defined(FLATPAK_BUILD)
@@ -88,9 +88,9 @@ struct DiscordActivityWrapper {
     template<typename T>
     DiscordActivityWrapper& set_start_timestamp(const std::chrono::time_point<T>& point) {
 
-        const auto seconds_since_epoch =
-                static_cast<u64>(std::chrono::duration_cast<std::chrono::milliseconds>(point.time_since_epoch()).count()
-                );
+        const auto seconds_since_epoch = static_cast<u64>(
+                std::chrono::duration_cast<std::chrono::milliseconds>(point.time_since_epoch()).count()
+        );
 
         auto timestamps = this->get_timestamps();
 
@@ -103,9 +103,9 @@ struct DiscordActivityWrapper {
     template<typename T>
     DiscordActivityWrapper& set_end_timestamp(const std::chrono::time_point<T>& point) {
 
-        const auto seconds_since_epoch =
-                static_cast<u64>(std::chrono::duration_cast<std::chrono::milliseconds>(point.time_since_epoch()).count()
-                );
+        const auto seconds_since_epoch = static_cast<u64>(
+                std::chrono::duration_cast<std::chrono::milliseconds>(point.time_since_epoch()).count()
+        );
 
         auto timestamps = this->get_timestamps();
 

subprojects/packagefiles/discord_social_sdk/android/meson.build

@@ -0,0 +1,86 @@
+##note: this file "parses" and uses the prefab data from the discord social sdk arr, read more on the prefab concept here:  https://developer.android.com/build/native-dependencies
+
+# this isn't feature complete and doesn't care about actual defintion and config files, it uses a fixed static layout from the .aar file and uses it hard coded
+
+aar_file = meson.project_source_root() / 'lib' / (get_option('buildtype') == 'release' ? 'release' : 'debug') / 'discord_partner_sdk.aar'
+
+unzip = find_program('unzip')
+
+unzip_base_dir = meson.current_source_dir()
+
+destination_directory = unzip_base_dir / 'prefab' / 'discord'
+
+message(destination_directory)
+
+fs = import('fs')
+
+if not fs.exists(destination_directory)
+
+    mkdir = find_program('mkdir')
+
+    run_command(
+        mkdir,
+        '-pv', destination_directory,
+        check: true,
+    )
+
+    run_command(
+        unzip,
+        aar_file,
+        '-d', destination_directory,
+        check: true,
+    )
+
+endif
+
+base_prefab_dir = destination_directory / 'prefab' / 'modules' / 'discord_partner_sdk'
+
+inc_dirs = include_directories(fs.relative_to(base_prefab_dir, unzip_base_dir) / 'include')
+
+header_files = files(
+    base_prefab_dir / 'include' / 'cdiscord.h',
+    base_prefab_dir / 'include' / 'discordpp.h',
+)
+
+install_headers(
+    header_files,
+    subdir: 'discord',
+)
+
+arch_name = host_machine.cpu_family()
+
+if host_machine.cpu_family() == 'arm'
+    arch_name = 'armeabi-v7a'
+elif host_machine.cpu_family() == 'aarch64'
+    arch_name = 'arm64-v8a'
+elif host_machine.cpu_family() == 'x86' or ost_machine.cpu_family() == 'x86_64'
+    # name is already correct
+else
+    error('unsupported android architecture: ' + host_machine.cpu_family())
+endif
+
+lib_dir = (base_prefab_dir / 'libs' / ('android.' + arch_name))
+
+c = meson.get_compiler('c')
+
+discord_partner_sdk = c.find_library(
+    'discord_partner_sdk',
+    dirs: [lib_dir],
+    required: true,
+)
+
+discord_social_sdk_lib = static_library(
+    'discord_social_sdk',
+    files('../impl.cpp'),
+    include_directories: inc_dirs,
+    dependencies: discord_partner_sdk,
+    install: true,
+)
+
+discord_social_sdk_dep = declare_dependency(
+    include_directories: inc_dirs,
+    version: meson.project_version(),
+    link_with: discord_social_sdk_lib,
+)
+
+meson.override_dependency('discord-social-sdk', discord_social_sdk_dep)