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 #include #include #include @@ -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.