From 860f8a364b2fd338508217c948d096ba9e1fe212 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 17 Aug 2020 10:41:51 +0000 Subject: [PATCH] Update libraries --- TMessagesProj/build.gradle | 6 +-- TMessagesProj/jni/Android.mk | 6 +-- TMessagesProj/jni/boringssl | 2 +- TMessagesProj/jni/ffmpeg | 2 +- TMessagesProj/jni/patch_boringssl.sh | 2 +- .../0001-only-build-what-we-need.patch | 53 ++++++++++++++++--- bin/init_release.sh | 7 +-- gradle.properties | 2 +- 8 files changed, 58 insertions(+), 22 deletions(-) diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index c8a074a6e..bbc96d4ef 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -59,7 +59,7 @@ buildscript { } dependencies { - classpath 'cn.hutool:hutool-all:5.3.10' + classpath 'cn.hutool:hutool-all:5.4.0' } } @@ -104,8 +104,8 @@ dependencies { implementation 'dnsjava:dnsjava:3.2.2' implementation 'org.dizitart:nitrite:3.4.2' - implementation 'cn.hutool:hutool-core:5.3.10' - implementation 'cn.hutool:hutool-crypto:5.3.10' + implementation 'cn.hutool:hutool-core:5.4.0' + implementation 'cn.hutool:hutool-crypto:5.4.0' implementation project(":openpgp-api") diff --git a/TMessagesProj/jni/Android.mk b/TMessagesProj/jni/Android.mk index e2b13ff03..5317be5b8 100644 --- a/TMessagesProj/jni/Android.mk +++ b/TMessagesProj/jni/Android.mk @@ -131,7 +131,7 @@ endif include $(PREBUILT_STATIC_LIBRARY) -include ./jni/TgCalls.mk +include $(LOCAL_PATH)/TgCalls.mk include $(CLEAR_VARS) LOCAL_CPPFLAGS := -Wall -std=c++14 -DANDROID -frtti -DHAVE_PTHREAD -finline-functions -ffast-math -Os @@ -519,7 +519,7 @@ $(LOCAL_PATH)/exoplayer/libFLAC/include \ $(LOCAL_PATH)/intro \ $(LOCAL_PATH)/rlottie/inc \ $(LOCAL_PATH)/tgcalls/ \ -./jni/webrtc/ \ +$(LOCAL_PATH)/webrtc/ \ $(LOCAL_PATH)/lz4 LOCAL_SRC_FILES += \ @@ -591,4 +591,4 @@ LOCAL_SRC_FILES += \ include $(BUILD_SHARED_LIBRARY) -$(call import-module,android/cpufeatures) \ No newline at end of file +$(call import-module,android/cpufeatures) diff --git a/TMessagesProj/jni/boringssl b/TMessagesProj/jni/boringssl index 251b5169f..9372f38cd 160000 --- a/TMessagesProj/jni/boringssl +++ b/TMessagesProj/jni/boringssl @@ -1 +1 @@ -Subproject commit 251b5169fd44345f455438312ec4e18ae07fd58c +Subproject commit 9372f38cd06d181e8c9badf34d0d733670f282cc diff --git a/TMessagesProj/jni/ffmpeg b/TMessagesProj/jni/ffmpeg index 799fc4d73..f9f95ceeb 160000 --- a/TMessagesProj/jni/ffmpeg +++ b/TMessagesProj/jni/ffmpeg @@ -1 +1 @@ -Subproject commit 799fc4d732fc2515911b75fe816da2bbd20221d9 +Subproject commit f9f95ceebfbd7b7f43c1b7ad34e25d366e6e2d2b diff --git a/TMessagesProj/jni/patch_boringssl.sh b/TMessagesProj/jni/patch_boringssl.sh index d43ac19c8..3dbd05f0c 100755 --- a/TMessagesProj/jni/patch_boringssl.sh +++ b/TMessagesProj/jni/patch_boringssl.sh @@ -3,4 +3,4 @@ set -e patch -d boringssl -p1 < patches/boringssl/0001-add-aes-ige-mode.patch -# patch -d boringssl -p1 < patches/boringssl/0001-only-build-what-we-need.patch +patch -d boringssl -p1 < patches/boringssl/0001-only-build-what-we-need.patch diff --git a/TMessagesProj/jni/patches/boringssl/0001-only-build-what-we-need.patch b/TMessagesProj/jni/patches/boringssl/0001-only-build-what-we-need.patch index 0ebc0558d..dfe2f0195 100644 --- a/TMessagesProj/jni/patches/boringssl/0001-only-build-what-we-need.patch +++ b/TMessagesProj/jni/patches/boringssl/0001-only-build-what-we-need.patch @@ -6,13 +6,14 @@ Subject: [PATCH] only build what we need --- CMakeLists.txt | 36 --------------------- crypto/CMakeLists.txt | 74 ------------------------------------------- - 2 files changed, 110 deletions(-) + ssl/CMakeLists.txt | 18 ------------------ + 3 files changed, 128 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd3532664..7fcfb1627 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -542,33 +542,7 @@ if(USE_CUSTOM_LIBCXX) +@@ -562,44 +562,8 @@ if(USE_CUSTOM_LIBCXX) target_link_libraries(libcxx libcxxabi) endif() @@ -27,17 +28,28 @@ index fd3532664..7fcfb1627 100644 -# themselves as dependencies next to the target definition. -add_custom_target(all_tests) - +-# On Windows, CRYPTO_TEST_DATA is too long to fit in command-line limits. +-# TODO(davidben): CMake 3.12 has a list(JOIN) command. Use that when we've +-# updated the minimum version. +-set(EMBED_TEST_DATA_ARGS "") +-foreach(arg ${CRYPTO_TEST_DATA}) +- set(EMBED_TEST_DATA_ARGS "${EMBED_TEST_DATA_ARGS}${arg}\n") +-endforeach() +-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/embed_test_data_args.txt" +- "${EMBED_TEST_DATA_ARGS}") +- -add_custom_command( - OUTPUT crypto_test_data.cc -- COMMAND ${GO_EXECUTABLE} run util/embed_test_data.go ${CRYPTO_TEST_DATA} > -- ${CMAKE_CURRENT_BINARY_DIR}/crypto_test_data.cc +- COMMAND ${GO_EXECUTABLE} run util/embed_test_data.go -file-list +- "${CMAKE_CURRENT_BINARY_DIR}/embed_test_data_args.txt" > +- "${CMAKE_CURRENT_BINARY_DIR}/crypto_test_data.cc" - DEPENDS util/embed_test_data.go ${CRYPTO_TEST_DATA} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - -add_library(crypto_test_data OBJECT crypto_test_data.cc) - add_subdirectory(crypto) --add_subdirectory(ssl) + add_subdirectory(ssl) -add_subdirectory(ssl/test) -add_subdirectory(tool) -add_subdirectory(util/fipstools/cavp) @@ -73,7 +85,7 @@ index e940f7d5f..f5221d70d 100644 if(FIPS_DELOCATE) SET_SOURCE_FILES_PROPERTIES(fipsmodule/bcm.o PROPERTIES EXTERNAL_OBJECT true) -@@ -461,93 +461,3 @@ endif() +@@ -466,94 +466,3 @@ endif() if(USE_CUSTOM_LIBCXX) target_link_libraries(crypto libcxx) endif() @@ -131,6 +143,7 @@ index e940f7d5f..f5221d70d 100644 - fipsmodule/rand/fork_detect_test.cc - fipsmodule/sha/sha_test.cc - hkdf/hkdf_test.cc +- hpke/hpke_test.cc - hmac_extra/hmac_test.cc - hrss/hrss_test.cc - impl_dispatch_test.cc @@ -167,6 +180,32 @@ index e940f7d5f..f5221d70d 100644 - target_link_libraries(crypto_test ws2_32) -endif() -add_dependencies(all_tests crypto_test) --- +diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt +index 0fb532eae..f5cab9807 100644 +--- a/ssl/CMakeLists.txt ++++ b/ssl/CMakeLists.txt +@@ -44,21 +44,3 @@ add_library( + add_dependencies(ssl global_target) + + target_link_libraries(ssl crypto) +- +-add_executable( +- ssl_test +- +- span_test.cc +- ssl_test.cc +- ssl_c_test.c +- +- $ +-) +- +-add_dependencies(ssl_test global_target) +- +-target_link_libraries(ssl_test test_support_lib boringssl_gtest ssl crypto) +-if(WIN32) +- target_link_libraries(ssl_test ws2_32) +-endif() +-add_dependencies(all_tests ssl_test) +-- 2.20.1 diff --git a/bin/init_release.sh b/bin/init_release.sh index 4e8684cec..78ddc15c4 100755 --- a/bin/init_release.sh +++ b/bin/init_release.sh @@ -2,11 +2,8 @@ function assemble() { - ./gradlew TMessagesProj:assembleFullRelease \ - TMessagesProj:assembleFullReleaseNoGcm \ - TMessagesProj:assembleMiniRelease \ - TMessagesProj:assembleMiniReleaseNoGcm \ - TMessagesProj:assembleMiniNoEmojiReleaseNoGcm + ./gradlew TMessagesProj:assembleRelease \ + TMessagesProj:assembleReleaseNoGcm return $? diff --git a/gradle.properties b/gradle.properties index 9cfce17dc..0d44c3f00 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ RELEASE_KEY_PASSWORD=android RELEASE_KEY_ALIAS=androidkey RELEASE_STORE_PASSWORD=android -org.gradle.jvmargs=-Xmx4096M -XX:MaxPermSize=4096m +org.gradle.jvmargs=-Xmx16384M -XX:MaxPermSize=16384m org.gradle.daemon=true org.gradle.parallel=true org.gradle.configureondemand=false