From 0b116cc2be730645f73135db0ca92b8a0c63f5a2 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 5 Aug 2019 23:21:09 +1000 Subject: [PATCH] android: Fix build with r18b by linking libc++_shared --- webrtc/android/app/src/main/jni/Android.mk | 4 ++-- webrtc/android/app/src/main/jni/Application.mk | 3 ++- webrtc/android/app/src/main/jni/dummy.cpp | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 webrtc/android/app/src/main/jni/dummy.cpp diff --git a/webrtc/android/app/src/main/jni/Android.mk b/webrtc/android/app/src/main/jni/Android.mk index a12b19e..469bcd7 100644 --- a/webrtc/android/app/src/main/jni/Android.mk +++ b/webrtc/android/app/src/main/jni/Android.mk @@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := gstwebrtc -LOCAL_SRC_FILES := webrtc.c +LOCAL_SRC_FILES := webrtc.c dummy.cpp LOCAL_SHARED_LIBRARIES := gstreamer_android LOCAL_LDLIBS := -llog -landroid @@ -44,7 +44,7 @@ GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) \ nice androidmedia # $(GSTREAMER_PLUGINS_CODECS) -GSTREAMER_EXTRA_DEPS := gstreamer-webrtc-1.0 gstreamer-video-1.0 libsoup-2.4 json-glib-1.0 glib-2.0 +GSTREAMER_EXTRA_DEPS := gstreamer-webrtc-1.0 gstreamer-sdp-1.0 gstreamer-video-1.0 libsoup-2.4 json-glib-1.0 glib-2.0 G_IO_MODULES = gnutls diff --git a/webrtc/android/app/src/main/jni/Application.mk b/webrtc/android/app/src/main/jni/Application.mk index 6f8c817..fd2823e 100644 --- a/webrtc/android/app/src/main/jni/Application.mk +++ b/webrtc/android/app/src/main/jni/Application.mk @@ -1,3 +1,4 @@ APP_PLATFORM = 15 -APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64 +APP_ABI = armeabi-v7a arm64-v8a x86 x86_64 +APP_STL = c++_shared #APP_ABI = armeabi-v7a arm64-v8a x86_64 diff --git a/webrtc/android/app/src/main/jni/dummy.cpp b/webrtc/android/app/src/main/jni/dummy.cpp new file mode 100644 index 0000000..a0dbbfc --- /dev/null +++ b/webrtc/android/app/src/main/jni/dummy.cpp @@ -0,0 +1 @@ +/* This is needed purely to force linking libc++_shared */ -- 2.7.4