Skip to content

Commit 49454ff

Browse files
author
Nicegram Team
committed
release 1.42.3
1 parent 2e3f058 commit 49454ff

11,596 files changed

Lines changed: 1500814 additions & 490597 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

TMessagesProj/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ dependencies {
6767

6868
implementation 'com.google.android.gms:play-services-mlkit-subject-segmentation:16.0.0-beta1'
6969
implementation 'com.google.android.gms:play-services-mlkit-image-labeling:16.0.8'
70+
7071
constraints {
7172
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
7273
because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")

TMessagesProj/jni/CMakeLists.txt

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ ${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libavutil.a,
1414
${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libswresample.a,
1515
${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libvpx.a,
1616
${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libdav1d.a,
17-
${CMAKE_HOME_DIRECTORY}/boringssl/lib/libssl_${ANDROID_ABI}.a,
18-
${CMAKE_HOME_DIRECTORY}/boringssl/lib/libcrypto_${ANDROID_ABI}.a")
17+
${CMAKE_HOME_DIRECTORY}/boringssl/lib/${ANDROID_ABI}/libssl.a,
18+
${CMAKE_HOME_DIRECTORY}/boringssl/lib/${ANDROID_ABI}/libcrypto.a,
19+
${CMAKE_HOME_DIRECTORY}/tde2e/${ANDROID_ABI}/libtde2e.a,
20+
${CMAKE_HOME_DIRECTORY}/tde2e/${ANDROID_ABI}/libtdutils.a")
1921

2022
if (${ANDROID_ABI} STREQUAL "armeabi-v7a" OR ${ANDROID_ABI} STREQUAL "arm64-v8a")
2123
enable_language(ASM)
@@ -42,17 +44,23 @@ add_library(swscale STATIC IMPORTED)
4244
set_target_properties(swscale PROPERTIES IMPORTED_LOCATION ${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libswscale.a)
4345

4446
add_library(crypto STATIC IMPORTED)
45-
set_target_properties(crypto PROPERTIES IMPORTED_LOCATION ${CMAKE_HOME_DIRECTORY}/boringssl/lib/libcrypto_${ANDROID_ABI}.a)
47+
set_target_properties(crypto PROPERTIES IMPORTED_LOCATION ${CMAKE_HOME_DIRECTORY}/boringssl/lib/${ANDROID_ABI}/libcrypto.a)
4648

4749
add_library(ssl STATIC IMPORTED)
48-
set_target_properties(ssl PROPERTIES IMPORTED_LOCATION ${CMAKE_HOME_DIRECTORY}/boringssl/lib/libssl_${ANDROID_ABI}.a)
50+
set_target_properties(ssl PROPERTIES IMPORTED_LOCATION ${CMAKE_HOME_DIRECTORY}/boringssl/lib/${ANDROID_ABI}/libssl.a)
4951

5052
add_library(libvpx STATIC IMPORTED)
5153
set_target_properties(libvpx PROPERTIES IMPORTED_LOCATION ${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libvpx.a)
5254

5355
add_library(libdav1d STATIC IMPORTED)
5456
set_target_properties(libdav1d PROPERTIES IMPORTED_LOCATION ${CMAKE_HOME_DIRECTORY}/ffmpeg/${ANDROID_ABI}/libdav1d.a)
5557

58+
add_library(tde2e STATIC IMPORTED)
59+
set_target_properties(tde2e PROPERTIES IMPORTED_LOCATION ${CMAKE_HOME_DIRECTORY}/tde2e/${ANDROID_ABI}/libtde2e.a)
60+
61+
add_library(tdutils STATIC IMPORTED)
62+
set_target_properties(tdutils PROPERTIES IMPORTED_LOCATION ${CMAKE_HOME_DIRECTORY}/tde2e/${ANDROID_ABI}/libtdutils.a)
63+
5664
#tgnet
5765
#add_library(mozjpeg STATIC
5866
# mozjpeg/cjpeg.c mozjpeg/cdjpeg.c mozjpeg/rdgif.c mozjpeg/rdppm.c mozjpeg/rdjpeg.c mozjpeg/rdswitch.c mozjpeg/rdbmp.c
@@ -376,6 +384,7 @@ add_library(${NATIVE_LIB} SHARED
376384
fast-edge.cpp
377385
genann.c
378386
secureid_ocr.cpp
387+
tde2e/bridge.cpp
379388
)
380389

381390
target_compile_options(${NATIVE_LIB} PUBLIC
@@ -626,7 +635,9 @@ target_include_directories(${NATIVE_LIB} PUBLIC
626635
intro
627636
rlottie/inc
628637
tgcalls/
629-
webrtc/)
638+
webrtc/
639+
tde2e/include
640+
)
630641

631642
target_link_libraries(${NATIVE_LIB}
632643
-Wl,--whole-archive rnnoise openh264 voipandroid -Wl,--no-whole-archive
@@ -645,6 +656,8 @@ target_link_libraries(${NATIVE_LIB}
645656
swresample
646657
libvpx
647658
libdav1d
659+
tde2e
660+
tdutils
648661
avutil
649662
ssl
650663
crypto

0 commit comments

Comments
 (0)