Using CMake from Android SDK

.travis.yml

@@ -4,7 +4,9 @@ before_install:
   # Installing the ndk and assembling the FFmpeg
   - yes | sdkmanager "ndk-bundle"
   - yes | sdkmanager "patcher;v4"
-  - export ANDROID_NDK_HOME=/usr/local/android-sdk/ndk-bundle
+  - yes | sdkmanager "cmake;3.10.2.4988404"
+  - export ANDROID_SDK_HOME=/usr/local/android-sdk
+  - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk-bundle
   # Keeping track of the NDK version that was used
   - cat $ANDROID_NDK_HOME/source.properties
 script:

scripts/export-host-variables.sh

@@ -22,3 +22,8 @@ fi
 export HOST_TAG=$HOST_TAG
 # Number of physical cores in the system to facilitate parallel assembling
 export HOST_NPROC=$HOST_NPROC
+
+# Using CMake from the Android SDK
+export CMAKE_EXECUTABLE=${ANDROID_SDK_HOME}/cmake/3.10.2.4988404/bin/cmake
+# Using host Make, because Android NDK's Make (before r21) doesn't work properly on MSYS2 in Windows
+export MAKE_EXECUTABLE=make

scripts/ffmpeg/build.sh

@@ -54,6 +54,6 @@ DEP_LD_FLAGS="-L${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}/lib $FFMPEG_EXTRA_LD_FLAGS"
   --disable-bsfs \
   $ADDITIONAL_COMPONENTS
 
-make clean
-make -j${HOST_NPROC}
-make install
+${MAKE_EXECUTABLE} clean
+${MAKE_EXECUTABLE} -j${HOST_NPROC}
+${MAKE_EXECUTABLE} install

scripts/libaom/build.sh

@@ -4,7 +4,7 @@ rm -rf ${CMAKE_BUILD_DIR}
 mkdir ${CMAKE_BUILD_DIR}
 cd ${CMAKE_BUILD_DIR}
 
-cmake .. \
+${CMAKE_EXECUTABLE} .. \
  -DANDROID_PLATFORM=${ANDROID_PLATFORM} \
  -DANDROID_ABI=${ANDROID_ABI} \
  -DCMAKE_TOOLCHAIN_FILE=${SCRIPTS_DIR}/libaom/android.cmake \
@@ -18,5 +18,5 @@ cmake .. \
  -DENABLE_EXAMPLES=0 \
  -DENABLE_TOOLS=0
 
-make -j${HOST_NPROC}
-make install
+${MAKE_EXECUTABLE} -j${HOST_NPROC}
+${MAKE_EXECUTABLE} install

scripts/libaom/download.sh

@@ -2,6 +2,8 @@
 
 # Exports SOURCES_DIR_libaom - path where actual sources are stored
 
+# TODO Consider using a specific git tag (like v1.0.0-errata1) for reproducible builds
+
 echo "Using aom master branch"
 AOM_SOURCES=aom
 if [[ ! -d "$LAME_SOURCES" ]]; then

scripts/libmp3lame/build.sh

@@ -17,6 +17,6 @@
 
 export FFMPEG_EXTRA_LD_FLAGS="${FFMPEG_EXTRA_LD_FLAGS} -lmp3lame"
 
-make clean
-make -j${HOST_NPROC}
-make install
+${MAKE_EXECUTABLE} clean
+${MAKE_EXECUTABLE} -j${HOST_NPROC}
+${MAKE_EXECUTABLE} install