Android - Updates for UE 5.3

voxeet · Sep 7, 2023 · 6ee2b56 · 6ee2b56
1 parent 61be047
commit 6ee2b56
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -206,7 +206,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["5.2"]
+        version: ["5.3"]
     runs-on: ["self-hosted", "X64", "macOS"]
 
     env:

diff --git a/DolbyIO/Source/DolbyIO_UPL.xml b/DolbyIO/Source/DolbyIO_UPL.xml
@@ -4,18 +4,6 @@
     <log text="DolbyIO plugin init"/>
   </init>
 
-  <gradleProperties>
-    <insert>
-      ANDROID_TOOLS_BUILD_GRADLE_VERSION=com.android.tools.build:gradle:7.3.1
-    </insert>
-  </gradleProperties>
-
-  <soLoadLibrary>
-    <loadLibrary
-      name="dolbyio_comms_sdk_android_cppsdk"
-      failmsg="Could not load libdolbyio_comms_sdk_android_cppsdk.so" />
-  </soLoadLibrary>
-
   <baseBuildGradleAdditions>
     <insert>
       allprojects {
@@ -42,4 +30,9 @@
     </insert>
   </buildGradleAdditions>
 
+  <soLoadLibrary>
+    <loadLibrary
+      name="dolbyio_comms_sdk_android_cppsdk" failmsg="Failed to load libdolbyio_comms_sdk_android_cppsdk.so" />
+  </soLoadLibrary>
+
 </root>
diff --git a/docs/docs/Intro.md b/docs/docs/Intro.md
@@ -14,7 +14,7 @@ The plugin is compatible with the following operating systems:
 - macOS 10.14 or later if you use UE4
 - macOS 12.5 or later if you use UE5
 - Ubuntu 20.04 or later
-- Android 8 or later
+- Android 8 or later if you use UE5.3 or later
 
 ## Prerequisites
 

diff --git a/docs/docs/tutorial/android.md b/docs/docs/tutorial/android.md
@@ -7,13 +7,22 @@ title: Targetting Android
 This tutorial explains how to set up the plugin to target Android devices.
 
 ## Prerequisites
-- JDK 17 or later
+
+Please follow the [official Android setup guide](https://docs.unrealengine.com/5.3/en-US/how-to-set-up-android-sdk-and-ndk-for-your-unreal-engine-development-environment/) for the Unreal Engine and make sure you can package and launch an Android game on a phone without using the plugin first. The Android version of the plugin supports Unreal Engine 5.3 or later.
 
 ## Setup
 1. Follow the [installation](installation) instructions for your development platform.
 2. Make sure that the Unreal Editor is closed.
 3. Download a plugin [release](https://github.com/DolbyIO/comms-sdk-unreal/releases) for Android and unpack the plugin to the `Plugins` folder. The release version should match your development platform release. Say yes to any overwrite prompts.
-4. Edit `{UnrealEngineRoot}/Build/Android/Java/gradle/gradle/wrapper/gradle-wrapper.properties` and modify `distributionUrl` to `https\://services.gradle.org/distributions/gradle-7.4.1-all.zip`
-5. Open your project in Unreal Editor.
-6. Set `Project Settings -> Platforms -> Android SDK -> Location of JAVA` to the directory containing the required JDK version.
-7. Tick the `Project Settings -> Platforms -> Android -> Advanced Build -> Disable libc++_shared dependency validation in all dependencies` checkbox.
+4. Open your project in Unreal Editor.
+5. Tick the `Project Settings -> Platforms -> Android -> Advanced Build -> Disable libc++_shared dependency validation in all dependencies` checkbox.
+
+## UnrealBuildTool
+
+It is also required to rebuild UnrealBuildTool to disable static libc++ linkage on Android.
+
+1. Go to `{UnrealEngineRoot}/Engine/Source/Programs/UnrealBuildTool``.
+2. Open the `UnrealBuildTool`` solution in Visual Studio.
+3. Open the `Platform/Android/AndroidToolChain.cs` file.
+4. Find the line `Result += " -static-libstdc++";` and comment it out or simply delete it.
+5. Select the `Development` build configuration (default is probably `Debug`) and build the solution.