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
45e9c3a4
Commit
45e9c3a4
authored
Jun 19, 2018
by
Ghislain MARY
Browse files
Revert "Fix armv5/gcc build for Android" that is breaking build on Linux systems.
This reverts commit
d643672e
.
parent
9507e4bd
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/CMakeLists.txt
View file @
45e9c3a4
...
...
@@ -381,9 +381,6 @@ 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 @
45e9c3a4
...
...
@@ -230,7 +230,7 @@ endif()
# TODO: Remove me later!
list
(
REMOVE_ITEM STRICT_OPTIONS_CPP
"-Wconversion"
"-Werror=conversion"
"-Wcast-align"
"-Werror=cast-align"
)
list
(
APPEND STRICT_OPTIONS_C
"-std=c99"
)
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 @
45e9c3a4
...
...
@@ -75,7 +75,6 @@ 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
];
...
...
@@ -85,7 +84,6 @@ 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 @
45e9c3a4
...
...
@@ -69,6 +69,12 @@ 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) {
...
...
jehan
@jehan
mentioned in commit
e289a58a
·
Jun 20, 2018
mentioned in commit
e289a58a
mentioned in commit e289a58a44bc4f91dd0d0130ff8121d75903a576
Toggle commit list
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