vlc | branch: master | Rafaël Carré <[email protected]> | Fri Aug 3 15:25:39 2012 +0200| [17fbcd4ed8605df087cfdf74681b1bf318353849] | committer: Rafaël Carré
contrib: move some android complexity outside of vlc.git > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=17fbcd4ed8605df087cfdf74681b1bf318353849 --- contrib/bootstrap | 3 --- contrib/src/main.mak | 2 -- 2 files changed, 5 deletions(-) diff --git a/contrib/bootstrap b/contrib/bootstrap index 3972f6f..631ac57 100755 --- a/contrib/bootstrap +++ b/contrib/bootstrap @@ -221,15 +221,12 @@ case "${OS}" in add_make_enabled "HAVE_LINUX" "HAVE_ANDROID" case "${HOST}" in *arm*) - add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}" add_make "PLATFORM_SHORT_ARCH := arm" ;; *i686*) - add_make "PATH = ${ANDROID_NDK}/toolchains/x86-4.4.3/prebuilt/linux-x86/bin/:${PATH}" add_make "PLATFORM_SHORT_ARCH := x86" ;; *mipsel*) - add_make "PATH = ${ANDROID_NDK}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86/bin/:${PATH}" add_make "PLATFORM_SHORT_ARCH := mips" ;; esac diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 621ab51..2d1d1f0 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -102,8 +102,6 @@ endif ifdef HAVE_ANDROID CC := $(HOST)-gcc --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH) CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH) -EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/include -EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ANDROID_ABI)/include endif ifdef HAVE_MACOSX _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
