Added boringssl to the project + Universal build script for static cmake dependencies + Bump native library version to 221

Author: vkryl

.gitmodules

@@ -68,3 +68,6 @@
 [submodule "vkryl/android"]
 	path = vkryl/android
 	url = https://github.com/TGX-Android/X-Android.git
+[submodule "app/jni/third_party/boringssl"]
+	path = app/jni/third_party/boringssl
+	url = https://github.com/google/boringssl

app/jni/CMakeLists.txt

@@ -13,6 +13,10 @@ set(TDLIB_DIR "${CMAKE_HOME_DIRECTORY}/../../tdlib")
 set(EXO_FLAC_DIR "${CMAKE_HOME_DIRECTORY}/../../thirdparty/ExoPlayer/extensions/flac/src/main/jni")
 set(UTILS_DIR "${THIRDPARTY_DIR}/jni-utils")
 
+set(SSL_DIR "${THIRDPARTY_DIR}/boringssl")
+set(SSL_LIB_PATH "${SSL_DIR}/build/${ANDROID_ABI}/ssl/libssl.a")
+set(CRYPTO_LIB_PATH "${SSL_DIR}/build/${ANDROID_ABI}/crypto/libcrypto.a")
+
 set(YUV_DIR "${THIRDPARTY_DIR}/libyuv")
 set(LZ4_DIR "${THIRDPARTY_DIR}/lz4/lib")
 set(RLOTTIE_DIR "${THIRDPARTY_DIR}/rlottie")
@@ -103,6 +107,8 @@ set(EXCLUDE_LIBS
   libopusfile.a
   librlottie.a
   liblz4.a
+  "${SSL_LIB_PATH}"
+  "${CRYPTO_LIB_PATH}"
 )
 if (${USE_WEBP})
   list(APPEND EXCLUDE_LIBS
@@ -137,6 +143,17 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.11.0")
   )
 endif()
 
+# crypto
+
+add_library(crypto STATIC IMPORTED)
+set_target_properties(crypto PROPERTIES IMPORTED_LOCATION "${CRYPTO_LIB_PATH}")
+
+# ssl
+
+add_library(ssl STATIC IMPORTED)
+set_target_properties(ssl PROPERTIES IMPORTED_LOCATION "${SSL_LIB_PATH}")
+target_include_directories(ssl INTERFACE "${SSL_DIR}/include")
+
 # flac
 
 ReadVariables("${EXO_FLAC_DIR}/flac_sources.mk")
@@ -925,6 +942,8 @@ target_link_libraries(${NATIVE_LIB}
   opus
   rlottie
   lz4
+  ssl
+  crypto
 )
 if (${USE_WEBP})
   target_link_libraries(${NATIVE_LIB} webpdecoder_static)

app/jni/third_party/boringssl

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+# shellcheck source=set-env.sh
+source "$(dirname "$0")"/set-env.sh
+
+run-cmake-impl.sh "$THIRDPARTY_LIBRARIES/boringssl" || (echo "boringssl build failed" && exit 1)

scripts/build-boringssl.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -e
+
+NDK_CMAKE_DIR="$ANDROID_SDK_ROOT/cmake/3.18.1"
+NDK_CMAKE_BIN="$NDK_CMAKE_DIR/bin/cmake"
+NDK_NINJA_BIN="$NDK_CMAKE_DIR/bin/ninja"
+TARGET_DIR="$1"
+
+validate_file "$NDK_CMAKE_BIN"
+validate_file "$NDK_NINJA_BIN"
+validate_dir "$TARGET_DIR"
+
+function run_cmake {
+  ARG_ABI="$1"
+  ARG_API_LEVEL="$2"
+  test -d "$ARG_ABI" || mkdir "$ARG_ABI"
+  pushd "$ARG_ABI" > /dev/null
+
+  $NDK_CMAKE_BIN -DANDROID_ABI="${ARG_ABI}" \
+    -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" \
+    -DANDROID_NATIVE_API_LEVEL="${ARG_API_LEVEL}" \
+    -GNinja ../..
+  $NDK_NINJA_BIN
+
+  popd > /dev/null
+}
+
+pushd "$TARGET_DIR"
+
+test -d build || mkdir build
+pushd build > /dev/null
+
+run_cmake arm64-v8a 21
+run_cmake armeabi-v7a 16
+run_cmake x86_64 21
+run_cmake x86 16
+
+popd > /dev/null
+popd

scripts/private/run-cmake-impl.sh

@@ -23,6 +23,9 @@ patch-opus-impl.sh
 # Patch ExoPlayer sources
 patch-exoplayer-impl.sh
 
+# Build boringssl
+run-cmake-impl.sh "$THIRDPARTY_LIBRARIES/boringssl"
+
 # Build and configure libvpx
 build-vpx-impl.sh
 

scripts/setup.sh

@@ -4,7 +4,7 @@ version.major=0
 # Anchor date point in app versioning
 version.creation=873642600564
 # Native bundle (/app/jni)
-version.jni=220
+version.jni=221
 # TDLib (/tdlib)
 version.tdlib=89
 # LevelDB (/vkryl/leveldb)