Skip to content

Commit 46c33e4

Browse files
committed
[JNI] Fix --exclude-libs entries for post-rebase libraries
- Remove libflac.a (flac library dropped during rebase) - Replace librlottie.a with libtlottie.a (rlottie replaced by tlottie) - Set OUTPUT_NAME opus on libopus target so archive is libopus.a (CMake prepends 'lib' to target name, producing liblibopus.a)
1 parent 06dcdc8 commit 46c33e4

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

TMessagesProj/jni/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set(CMAKE_C_FLAGS "-w -std=c11 -DANDROID -D_LARGEFILE_SOURCE=1 -g -Wno-error=imp
55
set(CMAKE_ASM_FLAGS "${CFLAGS} -x assembler-with-cpp")
66
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -fvisibility=hidden -flto=full")
77
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections -fvisibility=hidden -fvisibility-inlines-hidden -flto=full")
8-
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto=full -Wl,--gc-sections -Wl,--icf=safe -Wl,-Bsymbolic -Wl,--exclude-libs,libtgvoip.a,libtgcalls.a,libtgcalls_tp.a,libtgnet.a,libflac.a,librlottie.a,libsqlite.a,libopus.a,
8+
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto=full -Wl,--gc-sections -Wl,--icf=safe -Wl,-Bsymbolic -Wl,--exclude-libs,libtgvoip.a,libtgcalls.a,libtgcalls_tp.a,libtgnet.a,libtlottie.a,libsqlite.a,libopus.a,
99
${CMAKE_HOME_DIRECTORY}/ffmpeg/build/${ANDROID_ABI}/lib/libswscale.a,
1010
${CMAKE_HOME_DIRECTORY}/ffmpeg/build/${ANDROID_ABI}/lib/libavformat.a,
1111
${CMAKE_HOME_DIRECTORY}/ffmpeg/build/${ANDROID_ABI}/lib/libavcodec.a,
@@ -280,6 +280,7 @@ add_library(libopus STATIC
280280
target_compile_options(libopus PUBLIC
281281
-ffast-math -Oz -funroll-loops -fno-strict-aliasing -fno-math-errno)
282282
set_target_properties(libopus PROPERTIES
283+
OUTPUT_NAME opus
283284
ANDROID_ARM_MODE arm)
284285
target_compile_definitions(libopus PUBLIC
285286
OPUS_BUILD FIXED_POINT USE_ALLOCA restrict= __EMX__ LOCALE_NOT_USED HAVE_LRINT HAVE_LRINTF)

0 commit comments

Comments
 (0)