Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
CID
mirrors
libpEpAdapter
Compare Revisions
364bc2214df022eea4ff0ad03a40a9a669bcfc38...d06ecd610461204ef28e78d27e3cccf7b29e8554
Source
d06ecd610461204ef28e78d27e3cccf7b29e8554
Select Git revision
...
Target
364bc2214df022eea4ff0ad03a40a9a669bcfc38
Select Git revision
Compare
Commits (4)
LIB-14 Android build: Always include android/log.h not just on debug
· 54875050
Hussein
authored
Mar 29, 2021
54875050
Merge branch 'android-build'
· 34134e63
Matthias Heckmann
authored
Mar 29, 2021
34134e63
includes should not be in headers if not required in the header.
· e508e9be
Matthias Heckmann
authored
Mar 30, 2021
e508e9be
pEpEngine=Release_2.1.24
· d06ecd61
Matthias Heckmann
authored
Mar 30, 2021
d06ecd61
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
DEPENDENCIES
DEPENDENCIES
+1
-1
src/pEpLog.cc
src/pEpLog.cc
+5
-2
src/pEpLog.hh
src/pEpLog.hh
+0
-5
No files found.
DEPENDENCIES
View file @
d06ecd61
# 1st Party Dependencies
# 1st Party Dependencies
## Prefer git tags instead of SHA hashes when possible.
## Prefer git tags instead of SHA hashes when possible.
pEpEngine=Release_2.1.2
3
pEpEngine=Release_2.1.2
4
sequoia=365d00a08bec6a5a48d48a7c7893d78c27092b59
sequoia=365d00a08bec6a5a48d48a7c7893d78c27092b59
src/pEpLog.cc
View file @
d06ecd61
...
@@ -7,6 +7,10 @@
...
@@ -7,6 +7,10 @@
#include <mutex>
#include <mutex>
#include <atomic>
#include <atomic>
#ifdef ANDROID
#include <android/log.h>
#endif
namespace
pEp
{
namespace
pEp
{
namespace
Adapter
{
namespace
Adapter
{
...
@@ -14,7 +18,7 @@ namespace pEp {
...
@@ -14,7 +18,7 @@ namespace pEp {
std
::
mutex
mtx
;
std
::
mutex
mtx
;
std
::
atomic_bool
is_enabled
{
false
};
std
::
atomic_bool
is_enabled
{
false
};
void
set_enabled
(
bool
enabled
)
void
set_enabled
(
bool
enabled
)
{
{
...
@@ -37,7 +41,6 @@ namespace pEp {
...
@@ -37,7 +41,6 @@ namespace pEp {
#endif
#endif
}
}
}
}
}
// namespace pEpLog
}
// namespace pEpLog
}
// namespace Adapter
}
// namespace Adapter
}
// namespace pEp
}
// namespace pEp
src/pEpLog.hh
View file @
d06ecd61
...
@@ -33,10 +33,6 @@
...
@@ -33,10 +33,6 @@
do { \
do { \
} while (0)
} while (0)
#else
#else
#ifdef ANDROID
#include <android/log.h>
#endif
#define pEpLog(msg) \
#define pEpLog(msg) \
do { \
do { \
std::stringstream msg_ss; \
std::stringstream msg_ss; \
...
@@ -55,7 +51,6 @@ namespace pEp {
...
@@ -55,7 +51,6 @@ namespace pEp {
void
set_enabled
(
bool
is_enabled
);
void
set_enabled
(
bool
is_enabled
);
bool
get_enabled
();
bool
get_enabled
();
}
// namespace pEpLog
}
// namespace pEpLog
}
// namespace Adapter
}
// namespace Adapter
}
// namespace pEp
}
// namespace pEp
...
...