Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
liblinphone
Commits
e42a8d15
Commit
e42a8d15
authored
11 years ago
by
johan
Browse files
Options
Download
Patches
Plain Diff
Update Makefile and oRTP to switch to bzrtp
parent
8be3fd04
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build/android/Android.mk
+1
-1
build/android/Android.mk
oRTP
+1
-1
oRTP
with
2 additions
and
2 deletions
build/android/Android.mk
+
1
−
1
View file @
e42a8d15
...
@@ -201,7 +201,7 @@ LOCAL_CFLAGS += $(LIBLINPHONE_EXTENDED_CFLAGS)
...
@@ -201,7 +201,7 @@ LOCAL_CFLAGS += $(LIBLINPHONE_EXTENDED_CFLAGS)
ifeq
($(BUILD_GPLV3_ZRTP),1)
ifeq
($(BUILD_GPLV3_ZRTP),1)
LOCAL_SHARED_LIBRARIES
+=
libssl-linphone libcrypto-linphone
LOCAL_SHARED_LIBRARIES
+=
libssl-linphone libcrypto-linphone
LOCAL_SHARED_LIBRARIES
+=
libzrtp
cpp
LOCAL_SHARED_LIBRARIES
+=
lib
b
zrtp
endif
endif
ifeq
($(BUILD_SRTP),1)
ifeq
($(BUILD_SRTP),1)
...
...
This diff is collapsed.
Click to expand it.
oRTP
@
d3a18ddc
Subproject commit
b2e5f313e6f245588751835ccd01bcd5dc2e8b1e
Subproject commit
d3a18ddcf22f20480c7a1d9e38819e375d3c4d05
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets