Android contribs: accept extra CPPFLAG, CFLAGS and LDFLAGS.

Should fix #4561, thanks to stiger

diff --git a/extras/contrib/src/Distributions/android.mak b/extras/contrib/src/Distributions/android.mak
index e1ca13028be73babd1b9fd4742663d773631c98a..0135a20405692b37d1bb49170360f978e5999825 100644 (file)
--- a/extras/contrib/src/Distributions/android.mak
+++ b/extras/contrib/src/Distributions/android.mak
@@ -11,6 +11,5 @@ all: .zlib \
 ANDROID_INCLUDE=$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/include
 ANDROID_LIB=$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/lib
 
-EXTRA_CPPFLAGS=-I$(ANDROID_INCLUDE)
-EXTRA_LDFLAGS=-Wl,-rpath-link=$(ANDROID_LIB),-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined -Wl,-shared -L$(ANDROID_LIB)
-EXTRA_CFLAGS=
+EXTRA_CPPFLAGS+=-I$(ANDROID_INCLUDE)
+EXTRA_LDFLAGS+=-Wl,-rpath-link=$(ANDROID_LIB),-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined -Wl,-shared -L$(ANDROID_LIB)