commit b7370304cbf33a6ff53ec3955cda0bf18920df48
author Hridya Valsaraju <hridya@google.com> Wed Mar 08 14:39:23 2017 -0800
committer Hridya Valsaraju <hridya@google.com> Thu Mar 16 09:11:28 2017 -0700
tree b00ed2357ce7248d7e90add7ff2f99e651f1c299
parent 4ff88a31348e1c367ba3b6a4d97af215bdf00a99

Remove liblog usage in MQDescriptor.h

Also remove hidl_log_base class since static methods
in child classes will not be able to invoke
logAlwaysFatal().

Bug: 36070915
Test: hidl_test passes.
Change-Id: I90e8982698920e6710f7bc8e533e4eccdf3a35c7

base/include/hidl/MQDescriptor.h

diff --git a/base/include/hidl/MQDescriptor.h b/base/include/hidl/MQDescriptor.h
index 48e59dd..bf2f8a4 100644
--- a/base/include/hidl/MQDescriptor.h
+++ b/base/include/hidl/MQDescriptor.h
@@ -19,6 +19,7 @@
 
 #include <android-base/macros.h>
 #include <cutils/native_handle.h>
+#include <hidl/HidlInternal.h>
 #include <hidl/HidlSupport.h>
 #include <utils/Log.h>
 
@@ -116,7 +117,9 @@
     //TODO(b/34160777) Identify a better solution that supports remoting.
     static inline size_t alignToWordBoundary(size_t length) {
         constexpr size_t kAlignmentSize = 64;
-        LOG_ALWAYS_FATAL_IF(kAlignmentSize % __WORDSIZE != 0, "Incompatible word size");
+        if (kAlignmentSize % __WORDSIZE != 0) {
+            details::logAlwaysFatal("Incompatible word size");
+        }
         return (length + kAlignmentSize/8 - 1) & ~(kAlignmentSize/8 - 1U);
     }
 
@@ -161,8 +164,9 @@
       mFlags(flavor) {
     mGrantors.resize(grantors.size());
     for (size_t i = 0; i < grantors.size(); ++i) {
-        LOG_ALWAYS_FATAL_IF(isAlignedToWordBoundary(grantors[i].offset) == false,
-                            "Grantor offsets need to be aligned");
+        if (isAlignedToWordBoundary(grantors[i].offset) == false) {
+            details::logAlwaysFatal("Grantor offsets need to be aligned");
+        }
         mGrantors[i] = grantors[i];
     }
 }