Snap for 4632767 from 696c4ddca8e1ad15cb7c7f26d2bb0f633a6d3490 to pi-release
Change-Id: I00a5398c4475794ce948aeb1d8cfde8e021ac6f8
diff --git a/Android.bp b/Android.bp
index f66394a..16d0819 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,7 +42,6 @@
"-fprefetch-loop-arrays",
"-Wall",
"-Werror",
- "-Wno-error=unused-variable",
],
local_include_dirs: ["include"],
diff --git a/libspeex/resample.c b/libspeex/resample.c
index 9339432..ed4cfa3 100644
--- a/libspeex/resample.c
+++ b/libspeex/resample.c
@@ -341,7 +341,6 @@
const int frac_advance = st->frac_advance;
const spx_uint32_t den_rate = st->den_rate;
spx_word32_t sum;
- int j;
while (!(last_sample >= (spx_int32_t)*in_len || out_sample >= (spx_int32_t)*out_len))
{
@@ -351,7 +350,7 @@
#ifndef OVERRIDE_INNER_PRODUCT_SINGLE
float accum[4] = {0,0,0,0};
- for(j=0;j<N;j+=4) {
+ for(int j=0;j<N;j+=4) {
accum[0] += sinc[j]*iptr[j];
accum[1] += sinc[j+1]*iptr[j+1];
accum[2] += sinc[j+2]*iptr[j+2];