From 2c8b46ed4c6cecc92b1bf4732cd19a2b7a9c3b52 Mon Sep 17 00:00:00 2001 From: Olivier Crête Date: Thu, 6 Oct 2016 16:49:19 -0400 Subject: android: Update to use multi-arch builds --- gst-sdk/tutorials/android-tutorial-1/jni/Android.mk | 16 ++++++++++++++-- gst-sdk/tutorials/android-tutorial-1/jni/Application.mk | 1 + gst-sdk/tutorials/android-tutorial-2/jni/Android.mk | 16 ++++++++++++++-- gst-sdk/tutorials/android-tutorial-2/jni/Application.mk | 1 + gst-sdk/tutorials/android-tutorial-3/jni/Android.mk | 16 ++++++++++++++-- gst-sdk/tutorials/android-tutorial-3/jni/Application.mk | 1 + gst-sdk/tutorials/android-tutorial-4/jni/Android.mk | 16 ++++++++++++++-- gst-sdk/tutorials/android-tutorial-4/jni/Application.mk | 1 + gst-sdk/tutorials/android-tutorial-5/jni/Android.mk | 16 ++++++++++++++-- gst-sdk/tutorials/android-tutorial-5/jni/Application.mk | 2 ++ 10 files changed, 76 insertions(+), 10 deletions(-) create mode 100644 gst-sdk/tutorials/android-tutorial-1/jni/Application.mk create mode 100644 gst-sdk/tutorials/android-tutorial-2/jni/Application.mk create mode 100644 gst-sdk/tutorials/android-tutorial-3/jni/Application.mk create mode 100644 gst-sdk/tutorials/android-tutorial-4/jni/Application.mk create mode 100644 gst-sdk/tutorials/android-tutorial-5/jni/Application.mk diff --git a/gst-sdk/tutorials/android-tutorial-1/jni/Android.mk b/gst-sdk/tutorials/android-tutorial-1/jni/Android.mk index 7b28a48..ae15498 100644 --- a/gst-sdk/tutorials/android-tutorial-1/jni/Android.mk +++ b/gst-sdk/tutorials/android-tutorial-1/jni/Android.mk @@ -8,12 +8,24 @@ LOCAL_SHARED_LIBRARIES := gstreamer_android LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) -ifndef GSTREAMER_ROOT ifndef GSTREAMER_ROOT_ANDROID $(error GSTREAMER_ROOT_ANDROID is not defined!) 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 + GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/ GSTREAMER_PLUGINS := coreelements include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk diff --git a/gst-sdk/tutorials/android-tutorial-1/jni/Application.mk b/gst-sdk/tutorials/android-tutorial-1/jni/Application.mk new file mode 100644 index 0000000..b8848e8 --- /dev/null +++ b/gst-sdk/tutorials/android-tutorial-1/jni/Application.mk @@ -0,0 +1 @@ +APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64 diff --git a/gst-sdk/tutorials/android-tutorial-2/jni/Android.mk b/gst-sdk/tutorials/android-tutorial-2/jni/Android.mk index f575f42..42ed3c6 100644 --- a/gst-sdk/tutorials/android-tutorial-2/jni/Android.mk +++ b/gst-sdk/tutorials/android-tutorial-2/jni/Android.mk @@ -8,12 +8,24 @@ LOCAL_SHARED_LIBRARIES := gstreamer_android LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) -ifndef GSTREAMER_ROOT ifndef GSTREAMER_ROOT_ANDROID $(error GSTREAMER_ROOT_ANDROID is not defined!) 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 + 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) diff --git a/gst-sdk/tutorials/android-tutorial-2/jni/Application.mk b/gst-sdk/tutorials/android-tutorial-2/jni/Application.mk new file mode 100644 index 0000000..b8848e8 --- /dev/null +++ b/gst-sdk/tutorials/android-tutorial-2/jni/Application.mk @@ -0,0 +1 @@ +APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64 diff --git a/gst-sdk/tutorials/android-tutorial-3/jni/Android.mk b/gst-sdk/tutorials/android-tutorial-3/jni/Android.mk index 549e1e3..537e621 100644 --- a/gst-sdk/tutorials/android-tutorial-3/jni/Android.mk +++ b/gst-sdk/tutorials/android-tutorial-3/jni/Android.mk @@ -8,12 +8,24 @@ LOCAL_SHARED_LIBRARIES := gstreamer_android LOCAL_LDLIBS := -llog -landroid include $(BUILD_SHARED_LIBRARY) -ifndef GSTREAMER_ROOT ifndef GSTREAMER_ROOT_ANDROID $(error GSTREAMER_ROOT_ANDROID is not defined!) 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 + 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) diff --git a/gst-sdk/tutorials/android-tutorial-3/jni/Application.mk b/gst-sdk/tutorials/android-tutorial-3/jni/Application.mk new file mode 100644 index 0000000..b8848e8 --- /dev/null +++ b/gst-sdk/tutorials/android-tutorial-3/jni/Application.mk @@ -0,0 +1 @@ +APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64 diff --git a/gst-sdk/tutorials/android-tutorial-4/jni/Android.mk b/gst-sdk/tutorials/android-tutorial-4/jni/Android.mk index 3586fa1..9c19ac5 100644 --- a/gst-sdk/tutorials/android-tutorial-4/jni/Android.mk +++ b/gst-sdk/tutorials/android-tutorial-4/jni/Android.mk @@ -8,12 +8,24 @@ LOCAL_SHARED_LIBRARIES := gstreamer_android LOCAL_LDLIBS := -llog -landroid include $(BUILD_SHARED_LIBRARY) -ifndef GSTREAMER_ROOT ifndef GSTREAMER_ROOT_ANDROID $(error GSTREAMER_ROOT_ANDROID is not defined!) 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 + 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_PLAYBACK) $(GSTREAMER_PLUGINS_CODECS) $(GSTREAMER_PLUGINS_NET) $(GSTREAMER_PLUGINS_SYS) diff --git a/gst-sdk/tutorials/android-tutorial-4/jni/Application.mk b/gst-sdk/tutorials/android-tutorial-4/jni/Application.mk new file mode 100644 index 0000000..b8848e8 --- /dev/null +++ b/gst-sdk/tutorials/android-tutorial-4/jni/Application.mk @@ -0,0 +1 @@ +APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64 diff --git a/gst-sdk/tutorials/android-tutorial-5/jni/Android.mk b/gst-sdk/tutorials/android-tutorial-5/jni/Android.mk index 1211734..80e7b4e 100755 --- a/gst-sdk/tutorials/android-tutorial-5/jni/Android.mk +++ b/gst-sdk/tutorials/android-tutorial-5/jni/Android.mk @@ -8,12 +8,24 @@ LOCAL_SHARED_LIBRARIES := gstreamer_android LOCAL_LDLIBS := -llog -landroid include $(BUILD_SHARED_LIBRARY) -ifndef GSTREAMER_ROOT ifndef GSTREAMER_ROOT_ANDROID $(error GSTREAMER_ROOT_ANDROID is not defined!) 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 + 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_PLAYBACK) $(GSTREAMER_PLUGINS_CODECS) $(GSTREAMER_PLUGINS_NET) $(GSTREAMER_PLUGINS_SYS) diff --git a/gst-sdk/tutorials/android-tutorial-5/jni/Application.mk b/gst-sdk/tutorials/android-tutorial-5/jni/Application.mk new file mode 100644 index 0000000..8e7b0ef --- /dev/null +++ b/gst-sdk/tutorials/android-tutorial-5/jni/Application.mk @@ -0,0 +1,2 @@ +APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64 + -- cgit v1.2.3