[vlc-commits] old contribs: Use sane compilation flags for android

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Mon Aug 29 23:20:54 2011 -0400| [ea662f2cdb36c81e84c9487a0d4d5dc7492dab91] | committer: Rafaël Carré

old contribs: Use sane compilation flags for android

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

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

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index bd6fe07..4db4795 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -360,8 +360,8 @@ case "$DISTRO" in
     fi
     # The given host (arm-eabi) is not the real one (arm-linux-androideabi)
     ln -sfn $TARGET hosts/arm-linux-androideabi
-    CC="arm-linux-androideabi-gcc -nostdlib -lc -lgcc"
-    CXX="arm-linux-androideabi-g++ -nostdlib -lc -lgcc"
+    CC="arm-linux-androideabi-gcc --sysroot=$ANDROID_NDK/platforms/android-9/arch-arm"
+    CXX="arm-linux-androideabi-g++ --sysroot=$ANDROID_NDK/platforms/android-9/arch-arm"
     NM=arm-linux-androideabi-nm
     AR=arm-linux-androideabi-ar
     LD=arm-linux-androideabi-ld
diff --git a/extras/contrib/src/Distributions/android.mak b/extras/contrib/src/Distributions/android.mak
index c68f186..e1b14c7 100644
--- a/extras/contrib/src/Distributions/android.mak
+++ b/extras/contrib/src/Distributions/android.mak
@@ -12,4 +12,4 @@ 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_LDFLAGS+=-Wl,-rpath-link=$(ANDROID_LIB),-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined -L$(ANDROID_LIB)