Commit 943bc852 authored by Adrien Béraud's avatar Adrien Béraud

android: fix build on arm64

Change-Id: I9930519d16063a6d127fd82c7821ed197c8441d2
Tuleap: #1509
parent 7fd622d0
......@@ -163,6 +163,9 @@ endif
ifeq ($(ARCH),aarch64)
FFMPEGCONF += --arch=aarch64
endif
ifeq ($(ARCH),arm64)
FFMPEGCONF += --arch=aarch64
endif
# Windows
ifdef HAVE_WIN32
......
......@@ -120,8 +120,8 @@ endif
endif
ifdef HAVE_ANDROID
CC := clang
CXX := clang++
CC := $(CROSS_COMPILE)clang
CXX := $(CROSS_COMPILE)clang++
endif
ifdef HAVE_MACOSX
......
1cbd8872517c79eb2815409fa080096e7dcbb3f018574d978871a58b96ca29e38d3a36efe9427913feda0fbf4ebce2669eb09c280e2cd9d55d4ed2dad8a7dbb1 libvpx-v1.6.0.tar.gz
13b7eb515d026b302b8c484d6f06df067feb5aed4ceac953d85fe84fd684dab07e89ddbf80b4f395c6d9127709422156287e5754f49246050b2e18930adb3970 libvpx-v1.6.1.tar.gz
d593c727ed7b977dbd9d571898d1d8b268e534ba913440316cb9c3b15ede81bd427f22a0f45d2d4c2704b5b9a28a167745a8484fd68d917d3630075d5fa80e40 libvpx-v1.5.0.tar.gz
a3ce308cf193b80c25a96da467e771a1ab9615f4c12d6c00f14c895b9d455d0c3bf556e3f187bc0e58df1905f1ca59a2ac6fa82bc079311ad22cfd6c422a40a6 libvpx-v1.4.0.tar.gz
......@@ -2,7 +2,7 @@
#Libav doesnt support new vpx version
ifdef HAVE_ANDROID
VPX_HASH := v1.6.0
VPX_HASH := v1.6.1
else ifdef HAVE_IOS
VPX_HASH := v1.5.0
else
......@@ -113,13 +113,7 @@ VPX_CONF += --sdk-path=$(IOS_SDK)
endif
LOCAL_HOSTVARS=
ifdef HAVE_ANDROID
# vpx configure.sh overrides our sysroot and it looks for it itself, and
# uses that path to look for the compiler (which we already know)
VPX_CONF += --sdk-path=$(ANDROID_TOOLCHAIN)/bin
# needed for cpu-features.h
VPX_CONF += --extra-cflags="-I$(ANDROID_NDK)/sources/cpufeatures/ -fvisibility=hidden"
# set an explicit alternative libc since the sysroot override can make it blank
VPX_CONF += --libc=$(SYSROOT)
VPX_CONF += --disable-tools
LOCAL_HOSTVARS=$(HOSTVARS)
endif
......
......@@ -34,7 +34,8 @@ AM_CPPFLAGS = \
-DENABLE_TRACE \
-DRING_REVISION=\"$(RING_REVISION)\" \
-DRING_DIRTY_REPO=\"$(RING_DIRTY_REPO)\" \
-DPJSIP_MAX_PKT_LEN=8000 \
-DPJSIP_MAX_PKT_LEN=8000 \
-DPJ_AUTOCONF=1 \
$(SPEEXCODEC) \
$(GSMCODEC) \
$(OPUSCODEC)
......
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