mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-23 04:20:17 +00:00
playback/player/android: Switch to building against universal packages
This commit is contained in:
parent
fc41dd802f
commit
a5cdde9119
4 changed files with 17 additions and 18 deletions
|
@ -7,7 +7,7 @@ def getNdkCommandLine(ndkRoot, target) {
|
||||||
if (project.hasProperty('gstAndroidRoot'))
|
if (project.hasProperty('gstAndroidRoot'))
|
||||||
gstRoot = project.gstAndroidRoot
|
gstRoot = project.gstAndroidRoot
|
||||||
else
|
else
|
||||||
gstRoot = System.properties['user.home'] + '/cerbero/dist/android_arm'
|
throw new GradleException('"gstAndroidRoot" must be defined in your gradle properties to the top level directory of the unpacked universal GStreamer Android binaries')
|
||||||
|
|
||||||
if (ndkRoot == null)
|
if (ndkRoot == null)
|
||||||
throw new GradleException('NDK not configured')
|
throw new GradleException('NDK not configured')
|
||||||
|
|
|
@ -9,25 +9,22 @@ LOCAL_SHARED_LIBRARIES := gstreamer_android
|
||||||
LOCAL_LDLIBS := -llog -landroid
|
LOCAL_LDLIBS := -llog -landroid
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|
||||||
ifeq ($(TARGET_ARCH_ABI),armeabi)
|
|
||||||
GSTREAMER_ROOT := $(GSTREAMER_ROOT_ARM)
|
|
||||||
else ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
|
|
||||||
GSTREAMER_ROOT := $(GSTREAMER_ROOT_ARMV7)
|
|
||||||
else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
|
|
||||||
GSTREAMER_ROOT := $(GSTREAMER_ROOT_ARM64)
|
|
||||||
else ifeq ($(TARGET_ARCH_ABI),x86)
|
|
||||||
GSTREAMER_ROOT := $(GSTREAMER_ROOT_X86)
|
|
||||||
else ifeq ($(TARGET_ARCH_ABI),x86_64)
|
|
||||||
GSTREAMER_ROOT := $(GSTREAMER_ROOT_X86_64)
|
|
||||||
else
|
|
||||||
$(error Target arch ABI not supported)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifndef GSTREAMER_ROOT
|
|
||||||
ifndef GSTREAMER_ROOT_ANDROID
|
ifndef GSTREAMER_ROOT_ANDROID
|
||||||
$(error GSTREAMER_ROOT_ANDROID is not defined!)
|
$(error GSTREAMER_ROOT_ANDROID is not defined!)
|
||||||
endif
|
endif
|
||||||
GSTREAMER_ROOT := $(GSTREAMER_ROOT_ANDROID)
|
|
||||||
|
ifeq ($(TARGET_ARCH_ABI),armeabi)
|
||||||
|
GSTREAMER_ROOT := $(GSTREAMER_ROOT_ANDROID)/arm
|
||||||
|
else ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
|
||||||
|
GSTREAMER_ROOT := $(GSTREAMER_ROOT_ANDROID)/armv7
|
||||||
|
else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
|
||||||
|
GSTREAMER_ROOT := $(GSTREAMER_ROOT_ANDROID)/arm64
|
||||||
|
else ifeq ($(TARGET_ARCH_ABI),x86)
|
||||||
|
GSTREAMER_ROOT := $(GSTREAMER_ROOT_ANDROID)/x86
|
||||||
|
else ifeq ($(TARGET_ARCH_ABI),x86_64)
|
||||||
|
GSTREAMER_ROOT := $(GSTREAMER_ROOT_ANDROID)/x86_64
|
||||||
|
else
|
||||||
|
$(error Target arch ABI not supported: $(TARGET_ARCH_ABI))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
|
GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
APP_PLATFORM = 15
|
APP_PLATFORM = 15
|
||||||
|
APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64
|
||||||
|
|
|
@ -16,3 +16,4 @@
|
||||||
# This option should only be used with decoupled projects. More details, visit
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
# org.gradle.parallel=true
|
# org.gradle.parallel=true
|
||||||
|
gstAndroidRoot=/home/slomo/Projects/gstreamer/head/gst-examples/playback/player/gst-android
|
||||||
|
|
Loading…
Reference in a new issue