commit 7fe5e5ec595be83e1dacb91fe57315c2a89e0234
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 30 19:32:41 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 30 19:32:41 2017 +0000
tree 275e58ded3df5762ea53d40d8c554dcfd807837c
parent 2f7fbd63f6f7b069078cf18b8e415b4e989fe998
parent 6d6e6c23a8e73a4c8ef9940bb550199daf1fbdb6

Merge "logd + liblogd to Android.bp"

liblog/include_vndk/log/log.h

diff --git a/liblog/include_vndk/log/log.h b/liblog/include_vndk/log/log.h
index 01623df..a79beec 100644
--- a/liblog/include_vndk/log/log.h
+++ b/liblog/include_vndk/log/log.h
@@ -9,6 +9,7 @@
 #include <log/log_radio.h>
 #include <log/log_read.h>
 #include <log/log_safetynet.h>
+#include <log/log_system.h>
 #include <log/log_time.h>
 
 /*

liblog/include_vndk/log/log_system.h

diff --git a/liblog/include_vndk/log/log_system.h b/liblog/include_vndk/log/log_system.h
new file mode 120000
index 0000000..d0d3904
--- /dev/null
+++ b/liblog/include_vndk/log/log_system.h
@@ -0,0 +1 @@
+../../include/log/log_system.h
\ No newline at end of file

logd/tests/logd_test.cpp

diff --git a/logd/tests/logd_test.cpp b/logd/tests/logd_test.cpp
index cd80212..4397b14 100644
--- a/logd/tests/logd_test.cpp
+++ b/logd/tests/logd_test.cpp
@@ -933,8 +933,12 @@
 }
 
 #ifdef __ANDROID__
-static inline int32_t get4LE(const char* src) {
-    return src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24);
+static inline uint32_t get4LE(const uint8_t* src) {
+  return src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24);
+}
+
+static inline uint32_t get4LE(const char* src) {
+  return get4LE(reinterpret_cast<const uint8_t*>(src));
 }
 #endif