commit 649952f919f79c0aaf294f9f0be61d983c52da74
author Erik de Castro Lopo <erikd@mega-nerd.com> Thu Aug 20 17:51:09 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 20 17:51:09 2015 +0000
tree 0f76b84cfc5024579efa67125d8645ba4648fc36
parent fd4847848031c6642c9e47ab9e932de22f7f2972
parent 1e5f0b6c187bb91dcbcb2da0479928d1577222f7

am 1e5f0b6c: am 1d948ef7: libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow.

* commit '1e5f0b6c187bb91dcbcb2da0479928d1577222f7':
  libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow.

config.h

diff --git a/config.h b/config.h
index 793995f..f168a69 100644
--- a/config.h
+++ b/config.h
@@ -113,7 +113,11 @@
 #define PACKAGE_VERSION ""
 
 /* The size of a `void*', as computed by sizeof. */
+#if __LP64__
+#define SIZEOF_VOIDP 8
+#else
 #define SIZEOF_VOIDP 4
+#endif
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

libFLAC/Android.mk

diff --git a/libFLAC/Android.mk b/libFLAC/Android.mk
index 2adb498..6d97aa9 100644
--- a/libFLAC/Android.mk
+++ b/libFLAC/Android.mk
@@ -27,8 +27,6 @@
 LOCAL_CFLAGS += -D_REENTRANT -DPIC -DU_COMMON_IMPLEMENTATION -fPIC
 LOCAL_CFLAGS += -O3 -funroll-loops -finline-functions
 
-LOCAL_LDLIBS += -lm
-
 LOCAL_ARM_MODE := arm
 
 LOCAL_MODULE := libFLAC