Skip to content

Commit e82f38d

Browse files
committed
Reworked native build scripts + Added build-id-native.txt + Removed rudimentary cflags + Other compilation-level changes
1 parent 5d8e967 commit e82f38d

18 files changed

+193
-135
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ build
99
obj
1010

1111
build-id.txt
12+
build-id-native.txt
1213

1314
*.apk
1415
*.iml

‎app/jni/BuildFlac.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ target_compile_definitions(flac PRIVATE
3131
FLAC__HAS_OGG=0
3232
)
3333
target_compile_options(flac PRIVATE
34-
-funroll-loops -finline-functions -fPIC
34+
-funroll-loops -fPIC
3535
)

‎app/jni/BuildLibSRTP.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ target_compile_definitions(srtp PRIVATE
5555
HAVE_NETINET_IN_H
5656
HAVE_SYS_TYPES_H
5757
HAVE_UNISTD_H
58-
)
58+
)
5959
target_include_directories(srtp PRIVATE
6060
"${STUB_DIR}"
6161
)

‎app/jni/BuildRlottie.cmake

+4-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ add_library(rlottie STATIC
3636
"${RLOTTIE_DIR}/src/vector/vrect.cpp"
3737
"${RLOTTIE_DIR}/src/vector/vrle.cpp")
3838
target_compile_options(rlottie PRIVATE
39-
-finline-functions -ffast-math
4039
-Os
4140
-fno-unwind-tables -fno-asynchronous-unwind-tables
4241
-Wnon-virtual-dtor -Woverloaded-virtual
@@ -55,15 +54,17 @@ target_include_directories(rlottie PUBLIC
5554

5655
if (${ANDROID_ABI} STREQUAL "armeabi-v7a")
5756
target_compile_options(rlottie PUBLIC
58-
-fno-integrated-as)
57+
-fno-integrated-as
58+
)
5959
target_compile_definitions(rlottie PRIVATE
6060
USE_ARM_NEON
6161
)
6262
target_sources(rlottie PRIVATE
6363
"${RLOTTIE_DIR}/src/vector/pixman/pixman-arm-neon-asm.S")
6464
elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
6565
target_compile_options(rlottie PUBLIC
66-
-fno-integrated-as)
66+
-fno-integrated-as
67+
)
6768
target_compile_definitions(rlottie PRIVATE
6869
USE_ARM_NEON
6970
__ARM64_NEON__

‎app/jni/BuildTgCalls.cmake

+6-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ target_include_directories(tgcalls PUBLIC
8181
)
8282

8383
target_compile_options(tgcalls PUBLIC
84-
-Wall -finline-functions -ffast-math -fno-strict-aliasing -O3 -frtti -Wno-unknown-pragmas -funroll-loops -fexceptions -fno-math-errno
84+
-Wall -Werror -Wno-deprecated-declarations
85+
-fno-strict-aliasing
86+
-frtti
87+
-funroll-loops
88+
-fexceptions
89+
-fno-math-errno
8590
)
8691

8792
target_link_libraries(tgcalls PRIVATE

‎app/jni/BuildWebRTC.cmake

-5
Original file line numberDiff line numberDiff line change
@@ -2795,11 +2795,6 @@ set(WEBRTC_OPTIONS
27952795

27962796
target_compile_definitions(webrtc PUBLIC ${WEBRTC_OPTIONS})
27972797

2798-
#[[target_compile_options(webrtc INTERFACE
2799-
"$<$<COMPILE_LANGUAGE:C>:-std=c20>"
2800-
"$<$<COMPILE_LANGUAGE:CXX>:-std=c++20>"
2801-
)]]
2802-
28032798
target_compile_options(webrtc PRIVATE
28042799
-Wno-shorten-64-to-32
28052800
-Wno-macro-redefined

‎app/jni/BuildWebp.cmake

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ if (${ANDROID_ABI} STREQUAL "armeabi-v7a")
4141
endif()
4242
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
4343
target_compile_options(webpdecoder_static PRIVATE
44-
-frename-registers -s
44+
-frename-registers
45+
-s
4546
)
4647
endif()

‎app/jni/BuildYuv.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ target_include_directories(yuv PUBLIC
6767

6868
target_compile_options(yuv PRIVATE
6969
-fexceptions
70-
-finline-functions -ffast-math
71-
-Os
7270
-fno-unwind-tables -fno-asynchronous-unwind-tables
7371
-Wnon-virtual-dtor -Woverloaded-virtual
7472
-Wno-unused-parameter

0 commit comments

Comments
 (0)