arm 64 libs

ant-media · Feb 15, 2021 · 92d855d · 92d855d
1 parent 1610ff6
commit 92d855d
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 8 deletions.
diff --git a/src/main/assembly/server.xml b/src/main/assembly/server.xml
@@ -150,8 +150,22 @@
 
 		<!-- NATIVE LIBRARIES -->
 		<fileSet>
-			<directory>${project.basedir}/src/main/server/lib/native</directory>
-			<outputDirectory>lib/native</outputDirectory>
+			<directory>${project.basedir}/src/main/server/lib/native-mac</directory>
+			<outputDirectory>lib/native-mac</outputDirectory>
+			<includes>
+				<include>*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${project.basedir}/src/main/server/lib/native-linux-x86</directory>
+			<outputDirectory>lib/native-linux-x86</outputDirectory>
+			<includes>
+				<include>*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${project.basedir}/src/main/server/lib/native-linux-arm64</directory>
+			<outputDirectory>lib/native-linux-arm64</outputDirectory>
 			<includes>
 				<include>*</include>
 			</includes>

diff --git a/src/main/assembly/server_enterprise.xml b/src/main/assembly/server_enterprise.xml
@@ -88,7 +88,6 @@
 				<!-- Below libs are generic we need custom builds which are under src/main/server/plugins 
 				and they will copied later in this file -->
 				<exclude>ffmpeg*linux-x86.jar</exclude>
-				<exclude>ffmpeg*linux-arm64.jar</exclude>
 				<exclude>ffmpeg*linux-armhf.jar</exclude> 
 				<exclude>ffmpeg*android*.jar</exclude>
 				<exclude>ffmpeg*ppc64le.jar</exclude>
@@ -151,8 +150,22 @@
 
 		<!-- NATIVE LIBRARIES -->
 		<fileSet>
-			<directory>${project.basedir}/src/main/server/lib/native</directory>
-			<outputDirectory>lib/native</outputDirectory>
+			<directory>${project.basedir}/src/main/server/lib/native-mac</directory>
+			<outputDirectory>lib/native-mac</outputDirectory>
+			<includes>
+				<include>*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${project.basedir}/src/main/server/lib/native-linux-x86_64</directory>
+			<outputDirectory>lib/native-linux-x86_64</outputDirectory>
+			<includes>
+				<include>*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${project.basedir}/src/main/server/lib/native-linux-aarch64</directory>
+			<outputDirectory>lib/native-linux-aarch64</outputDirectory>
 			<includes>
 				<include>*</include>
 			</includes>

diff --git a/src/main/server/lib/native-linux-aarch64/libjingle_peerconnection_so.so b/src/main/server/lib/native-linux-aarch64/libjingle_peerconnection_so.so
diff --git a/src/main/server/lib/native-linux-aarch64/libtcnative-1.so b/src/main/server/lib/native-linux-aarch64/libtcnative-1.so
diff --git a/src/main/server/lib/native-linux-aarch64/libtcnative-1.so.0 b/src/main/server/lib/native-linux-aarch64/libtcnative-1.so.0
diff --git a/src/main/server/lib/native-linux-aarch64/libtcnative-1.so.0.2.23 b/src/main/server/lib/native-linux-aarch64/libtcnative-1.so.0.2.23
diff --git a/...lib/native/libjingle_peerconnection_so.so → ...nux-x86_64/libjingle_peerconnection_so.so b/...lib/native/libjingle_peerconnection_so.so → ...nux-x86_64/libjingle_peerconnection_so.so
diff --git a/src/main/server/lib/native/libtcnative-1.so → .../lib/native-linux-x86_64/libtcnative-1.so b/src/main/server/lib/native/libtcnative-1.so → .../lib/native-linux-x86_64/libtcnative-1.so
diff --git a/...main/server/lib/native/libtcnative-1.so.0 → ...ib/native-linux-x86_64/libtcnative-1.so.0 b/...main/server/lib/native/libtcnative-1.so.0 → ...ib/native-linux-x86_64/libtcnative-1.so.0
diff --git a/...server/lib/native/libtcnative-1.so.0.2.25 → ...tive-linux-x86_64/libtcnative-1.so.0.2.25 b/...server/lib/native/libtcnative-1.so.0.2.25 → ...tive-linux-x86_64/libtcnative-1.so.0.2.25
diff --git a/.../native/libjingle_peerconnection_so.dylib → ...ive-mac/libjingle_peerconnection_so.dylib b/.../native/libjingle_peerconnection_so.dylib → ...ive-mac/libjingle_peerconnection_so.dylib
diff --git a/...n/server/lib/native/libtcnative-1.0.dylib → ...rver/lib/native-mac/libtcnative-1.0.dylib b/...n/server/lib/native/libtcnative-1.0.dylib → ...rver/lib/native-mac/libtcnative-1.0.dylib
diff --git a/src/main/server/lib/native-mac/libtcnative-1.dylib b/src/main/server/lib/native-mac/libtcnative-1.dylib
diff --git a/src/main/server/lib/native/libtcnative-1.dylib b/src/main/server/lib/native/libtcnative-1.dylib
diff --git a/src/main/server/start.sh b/src/main/server/start.sh
@@ -99,13 +99,14 @@ case "$OS" in
   P=";" # Since these are actually Windows, let Java know
   ;;
   Linux*)
-      LD_LIBRARY_PATH=$RED5_HOME/lib/native
+      ARCH=`uname -m`
+      LD_LIBRARY_PATH=$RED5_HOME/lib/native-linux-$ARCH
       export LD_LIBRARY_PATH
       # Native path
       NATIVE="-Djava.library.path=$LD_LIBRARY_PATH"
   ;;
   Darwin*)
-      DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$RED5_HOME/lib/native
+      DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$RED5_HOME/lib/native-mac
       export DYLD_LIBRARY_PATH
       # Native path
       NATIVE="-Djava.library.path=$DYLD_LIBRARY_PATH"