commit 1f7f70a629b9c1c37bde73f0ddbb9428a9e22be7
author Igor Murashkin <iam@google.com> Tue Apr 15 18:06:39 2014 -0700
committer Riley Andrews <riandrews@google.com> Fri Jun 20 15:57:09 2014 -0700
tree 3e5585490a293eb159b65b70366c8ab508f673fc
parent 5bd578e10dc417e9c8d98705366456cc613b6152

libcutils: Fix warnings in properties.c when verbose logging is enabled

Change-Id: I07c5eb59b9395734ad3fc25eba753564c0f096a0

libcutils/properties.c

diff --git a/libcutils/properties.c b/libcutils/properties.c
index bfbd1b8..b283658 100644
--- a/libcutils/properties.c
+++ b/libcutils/properties.c
@@ -78,15 +78,16 @@
         if ((result == INTMAX_MIN || result == INTMAX_MAX) && errno == ERANGE) {
             // Over or underflow
             result = default_value;
-            ALOGV("%s(%s,%lld) - overflow", __FUNCTION__, key, default_value);
+            ALOGV("%s(%s,%" PRIdMAX ") - overflow", __FUNCTION__, key, default_value);
         } else if (result < lower_bound || result > upper_bound) {
             // Out of range of requested bounds
             result = default_value;
-            ALOGV("%s(%s,%lld) - out of range", __FUNCTION__, key, default_value);
+            ALOGV("%s(%s,%" PRIdMAX ") - out of range", __FUNCTION__, key, default_value);
         } else if (end == buf) {
             // Numeric conversion failed
             result = default_value;
-            ALOGV("%s(%s,%lld) - numeric conversion failed", __FUNCTION__, key, default_value);
+            ALOGV("%s(%s,%" PRIdMAX ") - numeric conversion failed",
+                    __FUNCTION__, key, default_value);
         }
 
         errno = tmp;

libcutils/tests/Android.mk

diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk
index e9d3ed7..d3e07f8 100644
--- a/libcutils/tests/Android.mk
+++ b/libcutils/tests/Android.mk
@@ -19,7 +19,8 @@
     PropertiesTest.cpp \
 
 shared_libraries := \
-    libutils
+    libutils \
+    liblog
 
 static_libraries := \
     libcutils