[vlc-commits] Android contribs: accept extra CPPFLAG, CFLAGS and LDFLAGS.

[Rémi Duraffort]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu Mar 10 20:34:43 2011 +0100| [93baedd3d213011aca1fbc0110d83de34265be68] | committer: Rémi Duraffort

Android contribs: accept extra CPPFLAG, CFLAGS and LDFLAGS.

Should fix #4561, thanks to stiger

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=93baedd3d213011aca1fbc0110d83de34265be68
---

 extras/contrib/src/Distributions/android.mak |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/Distributions/android.mak b/extras/contrib/src/Distributions/android.mak
index e1ca130..0135a20 100644
--- 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)