Skip to content

Commit

Permalink
update to 10.2.2 (4071)
Browse files Browse the repository at this point in the history
  • Loading branch information
dkaraush committed Oct 31, 2023
1 parent b4dbcd1 commit dfaff8c
Show file tree
Hide file tree
Showing 476 changed files with 741 additions and 9,095 deletions.
16 changes: 2 additions & 14 deletions TMessagesProj/jni/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -716,7 +705,6 @@ target_link_libraries(${NATIVE_LIB}
tgcalls_tp
mozjpeg
tgnet
lz4
webp
flac
rlottie
Expand Down
1 change: 0 additions & 1 deletion TMessagesProj/jni/lottie.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#include <android/bitmap.h>
#include <cstring>
#include <rlottie.h>
#include <lz4.h>
#include <unistd.h>
#include <condition_variable>
#include <atomic>
Expand Down

2 comments on commit dfaff8c

@bb010g
Copy link

@bb010g bb010g commented on dfaff8c Oct 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The source for 10.2.1 (4061) has not been published.

@Suburbanno
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:hurtrealbad:

Please sign in to comment.