[vlc-commits] android: Don' t add private header include directories when building the full VLC tree

[Martin Storsjö]

vlc/vlc-1.2 | branch: master | Martin Storsjö <martin at martin.st> | Fri Dec 16 23:47:05 2011 +0200| [923e95a9a2b8a6c2955b30e60213a4ae3d35aa89] | committer: Jean-Baptiste Kempf

android: Don't add private header include directories when building the full VLC tree

These aren't necessary any longer.

The approach of adding private headers to the build of the VLC
core doesn't work well if one wants to target multiple private
ABI versions in one build.

Instead, small shared libraries for each private ABI version
can be built separately.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 0eb7d1069b61e1ac249615e1ac08b0dadbd82518)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 extras/package/android/configure.sh |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/extras/package/android/configure.sh b/extras/package/android/configure.sh
index 3e70ac0..a57c688 100755
--- a/extras/package/android/configure.sh
+++ b/extras/package/android/configure.sh
@@ -29,11 +29,6 @@ fi
 CPPFLAGS="-I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${CXX_TARGET}/include"
 LDFLAGS="$LDFLAGS -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${CXX_TARGET}"
 
-if [ -n "$ANDROID_SYS_HEADERS" ]; then
-    CPPFLAGS="$CPPFLAGS -I${ANDROID_SYS_HEADERS}/frameworks/base/include -I${ANDROID_SYS_HEADERS}/system/core/include"
-    LDFLAGS="$LDFLAGS -L${ANDROID_LIBS}"
-fi
-
 SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-arm
 ANDROID_BIN=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.4.3/prebuilt/*-x86/bin/
 CROSS_COMPILE=${ANDROID_BIN}/arm-linux-androideabi-