diff options
| author | sebastienr <sebastien.raillet@marelli.com> | 2023-03-14 14:45:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 14:45:11 +0100 |
| commit | 4149df65ca6672236b9b4662c9d22271b4ada519 (patch) | |
| tree | f2e6cf61f28be1e6239d860d1be71fff022dbde2 /src | |
| parent | 363d433a5dac141020cef4f698f60644fe4a202c (diff) | |
| download | DLT-daemon-4149df65ca6672236b9b4662c9d22271b4ada519.tar.gz | |
dlt-logd-converter: fixes android 12 compilation (#445)v2.18.9-alpha
* Since android 12 release (and the introduction of this commit
https://chromium.googlesource.com/aosp/platform/system/
logging/+/b674866203f05957b2ac5db94c3c0fe3d1d36793), the define
ANDROID_LOG_RDONLY and friends have been removed (see the commit
for the explanation). Therefore, dlt-logd-converter can't compile
anymore since this version.
* ANDROID_LOG_RDONLY was a define on O_RDONLY. O_RDONLY is now used
to allow the compilation on android 12 as well as previous versions
* <log/logprint.h> include is removed because we aren't using any
API from this file and moreover, this file shouldn't be included from
vendor application (not part of public API)
* Direct include on "system/core/include" inside Android.bp is removed
because it was previously used to find <log/logprint.h>. This should
be avoided. We should keep android build system providing right
headers path for us :)
Signed-off-by: Sébastien RAILLET <sebastien.raillet@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/dlt-logd-converter.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/android/dlt-logd-converter.cpp b/src/android/dlt-logd-converter.cpp index 77e37a8..92f4386 100644 --- a/src/android/dlt-logd-converter.cpp +++ b/src/android/dlt-logd-converter.cpp @@ -22,7 +22,6 @@ #include <csignal> #include <log/log_read.h> -#include <log/logprint.h> #include <dlt.h> @@ -51,7 +50,7 @@ static inline struct logger *init_logger(struct logger_list *logger_list, log_id static struct logger_list *init_logger_list(bool skip_binary_buffers) { struct logger_list *logger_list; - logger_list = android_logger_list_alloc(ANDROID_LOG_RDONLY, 0, 0); + logger_list = android_logger_list_alloc(O_RDONLY, 0, 0); if (logger_list == nullptr) { DLT_LOG(dlt_ctx_self, DLT_LOG_FATAL, DLT_STRING("could not allocate logger list")); return nullptr; |