Android - Only support arm64-v8a on UE5 for now

voxeet · Sep 17, 2023 · af06853 · af06853
1 parent bc648d2
commit af06853
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -216,7 +216,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["4.27", "5.2"]
+        version: ["5.2"]
     runs-on: ["self-hosted", "X64", "macOS"]
 
     env:
@@ -242,13 +242,8 @@ jobs:
 
       - name: Build plugin
         env:
-          BUILD_ARGS: "BuildPlugin -Rocket -StrictIncludes -Plugin=\"$(pwd)/DolbyIO/DolbyIO.uplugin\" -Package=$(pwd)/Build/DolbyIO -TargetPlatforms=Android -Architecture_Android=x64+arm64 -NoHostPlatform"
+          BUILD_ARGS: "BuildPlugin -Rocket -StrictIncludes -Plugin=\"$(pwd)/DolbyIO/DolbyIO.uplugin\" -Package=$(pwd)/Build/DolbyIO -TargetPlatforms=Android -NoHostPlatform"
         run: |
-          if(${{ matrix.version }} -eq "4.27"){
-            $env:NDKROOT="${{ env.HOME }}/Android/Sdk/ndk/21.4.7075529"
-          } else {
-            $env:NDKROOT="${{ env.HOME }}/Android/Sdk/ndk/25.1.8937393"
-          }
           /Users/Shared/Epic\ Games/UE_${{ matrix.version }}/Engine/Build/BatchFiles/RunUAT.sh ${{ env.BUILD_ARGS }}
 
       - name: Zip plugin

diff --git a/DolbyIO/Source/DolbyIO.Build.cs b/DolbyIO/Source/DolbyIO.Build.cs
@@ -103,14 +103,11 @@ public DolbyIO(ReadOnlyTargetRules Target) : base(Target)
         }
         else if (Target.Platform == UnrealTargetPlatform.Android)
         {
-            foreach (string Arch in new string[] { "arm64-v8a", "armeabi-v7a", "x86", "x86_64" })
-            {
-                LibDir = Path.Combine(SdkDir, "libs", "android." + Arch);
-                string[] Libs = new string[] { Path.Combine(LibDir, "libdolbyio_comms_media.so"),
-                                               Path.Combine(LibDir, "libdolbyio_comms_sdk.so") };
-                PublicAdditionalLibraries.AddRange(Libs);
-                PublicDelayLoadDLLs.AddRange(Libs);
-            }
+            LibDir = Path.Combine(SdkDir, "libs", "android.arm64-v8a");
+            string[] Libs = new string[] { Path.Combine(LibDir, "libdolbyio_comms_media.so"),
+                                           Path.Combine(LibDir, "libdolbyio_comms_sdk.so") };
+            PublicAdditionalLibraries.AddRange(Libs);
+            PublicDelayLoadDLLs.AddRange(Libs);
 
             AdditionalPropertiesForReceipt.Add(
                 "AndroidPlugin",

diff --git a/scripts/android.sh b/scripts/android.sh
@@ -13,10 +13,14 @@ mkdir ${RELEASE_PATH}
 
 unzip ${AAR_PATH} -d ${AAR_TMP}
 
-cp -r ${AAR_TMP}/prefab/modules/sdk/* ${RELEASE_PATH}
+cp -r ${AAR_TMP}/prefab/modules/sdk/include ${RELEASE_PATH}
 
-for ARCH in arm64-v8a armeabi-v7a x86 x86_64
+for ARCH in arm64-v8a
 do
+  LIBS_PATH=libs/android.${ARCH}
+  mkdir -p ${RELEASE_PATH}/${LIBS_PATH}
+  cp -r ${AAR_TMP}/prefab/modules/sdk/${LIBS_PATH} ${RELEASE_PATH}/libs
+
   LIB_PATH=${AAR_TMP}/jni/${ARCH}
   cp ${LIB_PATH}/libdolbyio_comms_media.so ${LIB_PATH}/libdolbyio_comms_sdk_android_cppsdk.so ${RELEASE_PATH}/libs/android.${ARCH}
 done