Copy header files in addition to libraries and executables.

Author: jeffreywescott

_build_ffmpeg.sh

@@ -49,10 +49,12 @@ function build_ffmpeg {
   make >> ${build_log} 2>&1 || die "Couldn't build ffmpeg!"
   make install >> ${build_log} 2>&1 || die "Couldn't install ffmpeg!"
 
-  # copy the versioned libraries and executables
-  # lib*.so.+([0-9])
-  cp ${src_root}/ffmpeg/android/arm/lib/lib*-+([0-9]).so ${dist_root}/.
-  cp ${src_root}/ffmpeg/android/arm/bin/ff* ${dist_root}/.
+  # copy the versioned libraries
+  cp ${prefix}/lib/lib*-+([0-9]).so ${dist_lib_root}/.
+  # copy the executables
+   cp ${prefix}/bin/ff* ${dist_bin_root}/.
+  # copy the headers
+  cp -r ${prefix}/include/* ${dist_include_root}/.
 
   cd ${top_root}
 }

_build_librtmp.sh

@@ -26,7 +26,9 @@ function build_librtmp {
     die "Couldn't build librtmp for android!"
 
   # copy the versioned libraries
-  cp ${src_root}/rtmpdump/librtmp/android/arm/lib/lib*-+([0-9]).so ${dist_root}/.
+  cp ${prefix}/lib/lib*-+([0-9]).so ${dist_lib_root}/.
+  # copy the headers
+  cp -r ${prefix}/include/* ${dist_include_root}/.
 
   cd ${top_root}
 }

_build_openssl.sh

@@ -7,8 +7,13 @@ function build_openssl {
   cd ${src_root}/openssl-android
   ${NDK}/ndk-build >> ${build_log} 2>&1 || die "Couldn't build openssl-android!"
 
-  # copy the versioned libraries and executables
-  cp ${src_root}/openssl-android/libs/armeabi/* ${dist_root}/.
+  # copy the versioned libraries
+  cp ${src_root}/openssl-android/libs/armeabi/lib*.so ${dist_lib_root}/.
+  # copy the executables
+  cp ${src_root}/openssl-android/libs/armeabi/openssl ${dist_bin_root}/.
+  cp ${src_root}/openssl-android/libs/armeabi/ssltest ${dist_bin_root}/.
+  # copy the headers
+  cp -r ${src_root}/openssl-android/include/* ${dist_include_root}/.
 
   cd ${top_root}
 }

build.sh

@@ -41,6 +41,9 @@ function initialize {
   build_root=${top_root}/build
   patch_root=${top_root}/patches
   dist_root=${top_root}/build/dist
+  dist_bin_root=${dist_root}/bin
+  dist_include_root=${dist_root}/include
+  dist_lib_root=${dist_root}/lib
   build_log=${top_root}/build/build.log
   config_file=${top_root}/.build-config.sh
 
@@ -49,6 +52,9 @@ function initialize {
   test -d ${src_root} || mkdir -p ${src_root}
   test -d ${build_root} || mkdir -p ${build_root}
   test -d ${dist_root} || mkdir -p ${dist_root}
+  test -d ${dist_bin_root} || mkdir -p ${dist_bin_root}
+  test -d ${dist_include_root} || mkdir -p ${dist_include_root}
+  test -d ${dist_lib_root} || mkdir -p ${dist_lib_root}
   touch ${build_log}
 
   rm -f ${build_log}

test-streams.txt

@@ -0,0 +1,4 @@
+rtmp://www.planeta-online.tv:1936/live/channel_4
+rtmp://stream.lax.cine.io/20C45E/cines/cine20?prelude49&adbe-live-event=cine20
+
+ffmpeg -i rtmp://www.planeta-online.tv:1936/live/channel_4 -acodec copy -vcodec copy -f flv rtmp://stream.lax.cine.io/20C45E/cines/cine20?prelude49\&adbe-live-event=cine20