mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-21 09:53:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

tutorials/android: Update for NDK r18 changes

Browse source 
libc++_shared needs to be enabled in the application in order for it to
be included and used correctly for c++ plugins.

Only symbols from libraries explicitly mentioned are exported from
libgstreamer_android.so so we need to add a couple of deps to be able to
access the necessary functions.

Requires
https://gitlab.freedesktop.org/gstreamer/cerbero/merge_requests/31
https://gitlab.freedesktop.org/gstreamer/cerbero/merge_requests/1
This commit is contained in:
Matthew Waters 2018-11-30 18:12:26 +11:00 committed by Sebastian Dröge
parent 41ee4c7170
commit 5441a572d9
21 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
examples/tutorials/android/android-tutorial-1/build.gradle
View file

@ -29,8 +29,7 @@ android {
targets "tutorial-1"
// All archs except MIPS and MIPS64 are supported
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86'
// x86_64 abis disabled because of https://bugzilla.gnome.org/show_bug.cgi?id=795454
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
}
}
}

3
examples/tutorials/android/android-tutorial-1/jni/Android.mk
View file

@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := tutorial-1
LOCAL_SRC_FILES := tutorial-1.c
LOCAL_SRC_FILES := tutorial-1.c dummy.cpp
LOCAL_SHARED_LIBRARIES := gstreamer_android
LOCAL_LDLIBS := -llog
include $(BUILD_SHARED_LIBRARY)
@ -28,4 +28,5 @@ endif
GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
GSTREAMER_PLUGINS := coreelements
GSTREAMER_EXTRA_LIBS := -liconv
include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk

1
examples/tutorials/android/android-tutorial-1/jni/Application.mk
View file

@ -1 +1,2 @@
APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64
APP_STL = c++_shared

0
examples/tutorials/android/android-tutorial-1/jni/dummy.cpp Normal file
View file

3
examples/tutorials/android/android-tutorial-2/build.gradle
View file

@ -29,8 +29,7 @@ android {
targets "tutorial-2"
// All archs except MIPS and MIPS64 are supported
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86'
// x86_64 abis disabled because of https://bugzilla.gnome.org/show_bug.cgi?id=795454
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
}
}
}

3
examples/tutorials/android/android-tutorial-2/jni/Android.mk
View file

@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := tutorial-2
LOCAL_SRC_FILES := tutorial-2.c
LOCAL_SRC_FILES := tutorial-2.c dummy.cpp
LOCAL_SHARED_LIBRARIES := gstreamer_android
LOCAL_LDLIBS := -llog
include $(BUILD_SHARED_LIBRARY)
@ -29,4 +29,5 @@ endif
GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk
GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_SYS)
GSTREAMER_EXTRA_LIBS := -liconv
include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk

1
examples/tutorials/android/android-tutorial-2/jni/Application.mk
View file

@ -1 +1,2 @@
APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64
APP_STL = c++_shared

0
examples/tutorials/android/android-tutorial-2/jni/dummy.cpp Normal file
View file

3
examples/tutorials/android/android-tutorial-3/build.gradle
View file

@ -29,8 +29,7 @@ android {
targets "tutorial-3"
// All archs except MIPS and MIPS64 are supported
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86'
// x86_64 abis disabled because of https://bugzilla.gnome.org/show_bug.cgi?id=795454
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
}
}
}

5
examples/tutorials/android/android-tutorial-3/jni/Android.mk
View file

@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := tutorial-3
LOCAL_SRC_FILES := tutorial-3.c
LOCAL_SRC_FILES := tutorial-3.c dummy.cpp
LOCAL_SHARED_LIBRARIES := gstreamer_android
LOCAL_LDLIBS := -llog -landroid
include $(BUILD_SHARED_LIBRARY)
@ -29,5 +29,6 @@ endif
GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk
GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_SYS) $(GSTREAMER_PLUGINS_EFFECTS)
GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0
GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0 gobject-2.0
GSTREAMER_EXTRA_LIBS := -liconv
include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk

1
examples/tutorials/android/android-tutorial-3/jni/Application.mk
View file

@ -1 +1,2 @@
APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64
APP_STL = c++_shared

0
examples/tutorials/android/android-tutorial-3/jni/dummy.cpp Normal file
View file

3
examples/tutorials/android/android-tutorial-4/build.gradle
View file

@ -29,8 +29,7 @@ android {
targets "tutorial-4"
// All archs except MIPS and MIPS64 are supported
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86'
// x86_64 abis disabled because of https://bugzilla.gnome.org/show_bug.cgi?id=795454
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
}
}
}

2
examples/tutorials/android/android-tutorial-4/jni/Android.mk
View file

@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := tutorial-4
LOCAL_SRC_FILES := tutorial-4.c
LOCAL_SRC_FILES := tutorial-4.c dummy.cpp
LOCAL_SHARED_LIBRARIES := gstreamer_android
LOCAL_LDLIBS := -llog -landroid
include $(BUILD_SHARED_LIBRARY)

1
examples/tutorials/android/android-tutorial-4/jni/Application.mk
View file

@ -1 +1,2 @@
APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64
APP_STL = c++_shared

0
examples/tutorials/android/android-tutorial-4/jni/dummy.cpp Normal file
View file

3
examples/tutorials/android/android-tutorial-5/build.gradle
View file

@ -29,8 +29,7 @@ android {
targets "tutorial-5"
// All archs except MIPS and MIPS64 are supported
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86'
// x86_64 abis disabled because of https://bugzilla.gnome.org/show_bug.cgi?id=795454
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
}
}
}

2
examples/tutorials/android/android-tutorial-5/jni/Android.mk
View file

@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := tutorial-5
LOCAL_SRC_FILES := tutorial-5.c
LOCAL_SRC_FILES := tutorial-5.c dummy.cpp
LOCAL_SHARED_LIBRARIES := gstreamer_android
LOCAL_LDLIBS := -llog -landroid
include $(BUILD_SHARED_LIBRARY)

1
examples/tutorials/android/android-tutorial-5/jni/Application.mk
View file

@ -1 +1,2 @@
APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64
APP_STL = c++_shared

0
examples/tutorials/android/android-tutorial-5/jni/dummy.cpp Normal file
View file

2
examples/tutorials/android/build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.1'
classpath 'com.android.tools.build:gradle:3.1.4'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files