Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
e289a58a
Commit
e289a58a
authored
Jun 19, 2018
by
jehan
Browse files
Fix armv5/gcc build for Android without breaking Linux’s build
This reverts commit
45e9c3a4
.
parent
45e9c3a4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
7 deletions
+8
-7
src/CMakeLists.txt
src/CMakeLists.txt
+3
-0
tester/CMakeLists.txt
tester/CMakeLists.txt
+3
-1
tester/quality_reporting_tester.c
tester/quality_reporting_tester.c
+2
-0
wrappers/java/jni.mustache
wrappers/java/jni.mustache
+0
-6
No files found.
src/CMakeLists.txt
View file @
e289a58a
...
...
@@ -381,6 +381,9 @@ foreach (header ${LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES})
endforeach
()
set
(
LINPHONE_PRIVATE_HEADER_FILES
${
LINPHONE_PRIVATE_HEADER_FILES
}
PARENT_SCOPE
)
if
(
ANDROID AND CMAKE_C_COMPILER_ID STREQUAL
"GNU"
)
list
(
APPEND STRICT_OPTIONS_CXX
"-Wno-attributes"
)
endif
()
bc_apply_compile_flags
(
LINPHONE_CXX_OBJECTS_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX
)
bc_apply_compile_flags
(
LINPHONE_OBJC_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OPTIONS_OBJC
)
...
...
tester/CMakeLists.txt
View file @
e289a58a
...
...
@@ -230,7 +230,9 @@ endif()
# TODO: Remove me later!
list
(
REMOVE_ITEM STRICT_OPTIONS_CPP
"-Wconversion"
"-Werror=conversion"
"-Wcast-align"
"-Werror=cast-align"
)
if
(
ANDROID AND CMAKE_C_COMPILER_ID STREQUAL
"GNU"
)
#restrict to Android as it seems to break reguler linux
list
(
APPEND STRICT_OPTIONS_C
"-std=c99"
)
endif
()
bc_apply_compile_flags
(
SOURCE_FILES_C STRICT_OPTIONS_CPP STRICT_OPTIONS_C
)
bc_apply_compile_flags
(
SOURCE_FILES_CXX STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX
)
bc_apply_compile_flags
(
SOURCE_FILES_OBJC STRICT_OPTIONS_CPP STRICT_OPTIONS_OBJC
)
...
...
tester/quality_reporting_tester.c
View file @
e289a58a
...
...
@@ -75,6 +75,7 @@ static const char *on_report_send_verify_metrics (const reporting_content_metric
return
body
;
}
#if VIDEO_ENABLED
static
void
on_report_send_with_rtcp_xr_local
(
const
LinphoneCall
*
call
,
SalStreamType
stream_type
,
const
LinphoneContent
*
content
)
{
char
*
remote_metrics_start
=
__strstr
(
linphone_content_get_string_buffer
(
content
),
"RemoteMetrics:"
);
reporting_session_report_t
*
report
=
linphone_quality_reporting_get_reports
(
linphone_call_log_get_quality_reporting
(
linphone_call_get_log
(
call
)))[
stream_type
];
...
...
@@ -84,6 +85,7 @@ static void on_report_send_with_rtcp_xr_local (const LinphoneCall *call, SalStre
BC_ASSERT_PTR_NOT_NULL
(
body
=
__strstr
(
body
,
"LocalMetrics:"
));
BC_ASSERT_TRUE
(
!
remote_metrics_start
||
on_report_send_verify_metrics
(
&
report
->
local_metrics
,
body
)
<
remote_metrics_start
);
}
#endif
static
void
on_report_send_with_rtcp_xr_remote
(
const
LinphoneCall
*
call
,
SalStreamType
stream_type
,
const
LinphoneContent
*
content
)
{
char
*
body
=
(
char
*
)
linphone_content_get_buffer
(
content
);
...
...
wrappers/java/jni.mustache
View file @
e289a58a
...
...
@@ -69,12 +69,6 @@ static jlong GetObjectNativePtr(JNIEnv *env, jobject object) {
return nativePtr;
}
static void SetObjectNativePtr(JNIEnv *env, jobject object, jlong ptr) {
jclass objClass = env->GetObjectClass(object);
jfieldID nativePtrId = env->GetFieldID(objClass, "nativePtr", "J");
env->SetLongField(object, nativePtrId, ptr);
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void linphone_android_log_handler(int prio, char *str) {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment