Skip to content

V
vlc-2-2
Commit 17fbcd4e authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

contrib: move some android complexity outside of vlc.git

parent c97faddc
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
contrib/bootstrap
View file @ 17fbcd4e
...@@ -221,15 +221,12 @@ case "${OS}" in ...@@ -221,15 +221,12 @@ case "${OS}" in
add_make_enabled "HAVE_LINUX" "HAVE_ANDROID" add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
case "${HOST}" in case "${HOST}" in
*arm*) *arm*)
add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
add_make "PLATFORM_SHORT_ARCH := arm" add_make "PLATFORM_SHORT_ARCH := arm"
;; ;;
*i686*) *i686*)
add_make "PATH = ${ANDROID_NDK}/toolchains/x86-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
add_make "PLATFORM_SHORT_ARCH := x86" add_make "PLATFORM_SHORT_ARCH := x86"
;; ;;
*mipsel*) *mipsel*)
add_make "PATH = ${ANDROID_NDK}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
add_make "PLATFORM_SHORT_ARCH := mips" add_make "PLATFORM_SHORT_ARCH := mips"
;; ;;
esac esac
......
contrib/src/main.mak
View file @ 17fbcd4e
...@@ -102,8 +102,6 @@ endif ...@@ -102,8 +102,6 @@ endif
ifdef HAVE_ANDROID ifdef HAVE_ANDROID
CC := $(HOST)-gcc --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH) 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) 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 endif
ifdef HAVE_MACOSX ifdef HAVE_MACOSX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment