update to 10.2.2 (4071)

Marvellous890 · Oct 31, 2023 · dfaff8c · dfaff8c
1 parent b4dbcd1
commit dfaff8c
Show file tree

Hide file tree

Showing 476 changed files with 741 additions and 9,095 deletions.
diff --git a/TMessagesProj/jni/CMakeLists.txt b/TMessagesProj/jni/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_C_FLAGS "-w -std=c11 -DANDROID -D_LARGEFILE_SOURCE=1 -g")
 set(CMAKE_ASM_FLAGS "${CFLAGS} -x assembler-with-cpp")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--exclude-libs,libtgvoip.a,libtgcalls.a,libtgcalls_tp.a,libtgnet.a,liblz4.a,libwebp.a,libflac.a,librlottie.a,libsqlite.a,
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--exclude-libs,libtgvoip.a,libtgcalls.a,libtgcalls_tp.a,libtgnet.a,libwebp.a,libflac.a,librlottie.a,libsqlite.a,
 ${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libswscale.a,
 ${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libavformat.a,
 ${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libavcodec.a,
@@ -381,16 +381,6 @@ target_compile_definitions(webp PUBLIC
 target_include_directories(webp PUBLIC
         libwebp/src)
 
-#lz4
-add_library(lz4 STATIC
-        lz4/lz4.c
-        lz4/lz4frame.c
-        lz4/xxhash.c)
-target_compile_options(lz4 PUBLIC
-        -w -O3)
-set_target_properties(lz4 PROPERTIES
-        ANDROID_ARM_MODE arm)
-
 #sqlite
 add_library(sqlite STATIC
         sqlite/sqlite3.c)
@@ -706,8 +696,7 @@ target_include_directories(${NATIVE_LIB} PUBLIC
         intro
         rlottie/inc
         tgcalls/
-        webrtc/
-        lz4)
+        webrtc/)
 
 target_link_libraries(${NATIVE_LIB}
         -Wl,--whole-archive rnnoise openh264 voipandroid -Wl,--no-whole-archive
@@ -716,7 +705,6 @@ target_link_libraries(${NATIVE_LIB}
         tgcalls_tp
         mozjpeg
         tgnet
-        lz4
         webp
         flac
         rlottie

diff --git a/TMessagesProj/jni/lottie.cpp b/TMessagesProj/jni/lottie.cpp
@@ -2,7 +2,6 @@
 #include <android/bitmap.h>
 #include <cstring>
 #include <rlottie.h>
-#include <lz4.h>
 #include <unistd.h>
 #include <condition_variable>
 #include <atomic>