Fix gcc test issues.

Change-Id: I2b26b779f5198c7c9362a452b971260a8852aa7b
This commit is contained in:
Christopher Ferris 2016-01-25 17:23:38 -08:00
parent f2b67b85f5
commit 1e185a5056
2 changed files with 15 additions and 8 deletions

View File

@ -72,5 +72,6 @@ LOCAL_SHARED_LIBRARIES := libbase
LOCAL_CFLAGS := \
-Wall \
-Werror \
-Wno-error=format-zero-length \
include $(BUILD_NATIVE_TEST)

View File

@ -111,14 +111,20 @@ class MallocDebugTest : public ::testing::Test {
};
MallocDispatch MallocDebugTest::dispatch = {
.calloc = calloc,
.free = free,
.mallinfo = mallinfo,
.malloc = malloc,
.malloc_usable_size = malloc_usable_size,
.memalign = memalign,
.posix_memalign = posix_memalign,
.realloc = realloc,
calloc,
free,
mallinfo,
malloc,
malloc_usable_size,
memalign,
posix_memalign,
#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
nullptr,
#endif
realloc,
#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
nullptr,
#endif
};
void VerifyAllocCalls() {