Merge pull request #166 from wseemann/dev

Improved https support
wseemann · Oct 15, 2017 · 5e3dc71 · 5e3dc71
2 parents 63f68a1 + 4fb4081
commit 5e3dc71
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/gradle/fmmr-library/library/build.gradle b/gradle/fmmr-library/library/build.gradle
@@ -6,8 +6,8 @@ android {
     compileSdkVersion 25
     buildToolsVersion '25.0.0'
 
-    def mkfile = "NDK_APPLICATION_MK=Application.mk"
-    def aarname = "all-fmmr"
+    //def mkfile = "NDK_APPLICATION_MK=Application.mk"
+    //def aarname = "all-fmmr"
 
     //def mkfile = "NDK_APPLICATION_MK=ARMApplication.mk"
     //def aarname = "arm-fmmr"
@@ -24,8 +24,8 @@ android {
     //def mkfile = "NDK_APPLICATION_MK=x86_64Application.mk"
     //def aarname = "x86_64-fmmr"
 
-    //def mkfile = "NDK_APPLICATION_MK=ARM_64Application.mk"
-    //def aarname = "arm_64-fmmr"
+    def mkfile = "NDK_APPLICATION_MK=ARM_64Application.mk"
+    def aarname = "arm_64-fmmr"
 
     defaultConfig {
         minSdkVersion 12
@@ -49,8 +49,8 @@ android {
 
     task buildFFmpeg(type: Exec, description: 'Compile FFmpeg source via NDK') {
         def dir = file('src/main/ffmpeg/build-ffmpeg.sh').absolutePath
-        commandLine "$dir"
-                //'--with-openssl'
+        commandLine "$dir",
+                '--with-openssl'
     }
 
     task buildNative(type: Exec, description: 'Compile JNI source via NDK') {

diff --git a/gradle/fmmr-library/library/src/main/ffmpeg/build_openssl.sh b/gradle/fmmr-library/library/src/main/ffmpeg/build_openssl.sh
@@ -115,6 +115,12 @@ then
     exit 0
 else
     ./config shared no-ssl2 no-ssl3 no-comp no-hw no-engine --openssldir=$INSTALL_DIR --prefix=$INSTALL_DIR
+
+    # Remove the version from the soname generated by the makefile
+    echo "Modify openssl makefile to remove version from soname"
+    sed -i.bak 's/^SHLIB_EXT=\.so\..*/SHLIB_EXT=\.so/' Makefile
+    sed -i.bak 's/LIBVERSION=[^ ]* /LIBVERSION= /g' Makefile
+    sed -i.bak 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile
 fi
 
 make depend

diff --git a/gradle/fmmr-library/library/src/main/ffmpeg/libopenssl_builder.sh b/gradle/fmmr-library/library/src/main/ffmpeg/libopenssl_builder.sh
@@ -193,6 +193,10 @@ echo "========================================"
     # Remove the version from the soname generated by the makefile
     echo "Modify openssl makefile to remove version from soname"
     pushd $openssl_directory > /dev/null
+    sed -i.bak 's/^SHLIB_EXT=\.so\..*/SHLIB_EXT=\.so/' Makefile
+    sed -i.bak 's/LIBVERSION=[^ ]* /LIBVERSION= /g' Makefile
+    sed -i.bak 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile
+    popd > /dev/null
 
     echo "Building openssl"
     pushd $openssl_directory > /dev/null