From 6c53de92cf7e759488538280788325fac6ccdea2 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Thu, 10 Sep 2015 10:01:22 +0100
Subject: [PATCH] Follow up to change b638126ed DO NOT MERGE.

Resolves delta between the kitkat and L version of this patch.
Fixes the molly build on klp-dev.

bug: 22953624
Change-Id: I696a506320f30d3d5cd95f6da35361244986cb36
---
 libutils/tests/Android.mk      | 7 -------
 libutils/tests/Vector_test.cpp | 6 ++++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/libutils/tests/Android.mk b/libutils/tests/Android.mk
index d6e40e020..77692c0d1 100644
--- a/libutils/tests/Android.mk
+++ b/libutils/tests/Android.mk
@@ -33,10 +33,3 @@ $(foreach file,$(test_src_files), \
     $(eval include $(BUILD_NATIVE_TEST)) \
 )
 
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libutils_tests_host
-LOCAL_SRC_FILES := Vector_test.cpp
-LOCAL_STATIC_LIBRARIES := libutils liblog
-
-include $(BUILD_HOST_NATIVE_TEST)
diff --git a/libutils/tests/Vector_test.cpp b/libutils/tests/Vector_test.cpp
index 09914bd40..801318721 100644
--- a/libutils/tests/Vector_test.cpp
+++ b/libutils/tests/Vector_test.cpp
@@ -16,6 +16,8 @@
 
 #define LOG_TAG "Vector_test"
 
+#define __STDC_LIMIT_MACROS
+#include <stdint.h>
 #include <utils/Vector.h>
 #include <cutils/log.h>
 #include <gtest/gtest.h>
@@ -87,9 +89,9 @@ TEST_F(VectorTest, SetCapacity_ShrinkBelowSize) {
   vector.add(4);
 
   vector.setCapacity(8);
-  ASSERT_EQ(8, vector.capacity());
+  ASSERT_EQ(8U, vector.capacity());
   vector.setCapacity(2);
-  ASSERT_EQ(8, vector.capacity());
+  ASSERT_EQ(8U, vector.capacity());
 }
 
 // NOTE: All of the tests below are useless because of the "TODO" above.