From a5cdde9119f038a1eb365aca20faa9741a38e788 Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arun@arunraghavan.net>
Date: Sun, 4 Sep 2016 10:12:52 +0300
Subject: [PATCH] playback/player/android: Switch to building against universal
 packages

---
 playback/player/android/app/build.gradle      |  2 +-
 .../android/app/src/main/jni/Android.mk       | 29 +++++++++----------
 .../android/app/src/main/jni/Application.mk   |  1 +
 playback/player/android/gradle.properties     |  3 +-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/playback/player/android/app/build.gradle b/playback/player/android/app/build.gradle
index 50b135e94e..5119ca38b8 100644
--- a/playback/player/android/app/build.gradle
+++ b/playback/player/android/app/build.gradle
@@ -7,7 +7,7 @@ def getNdkCommandLine(ndkRoot, target) {
     if (project.hasProperty('gstAndroidRoot'))
         gstRoot = project.gstAndroidRoot
     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)
         throw new GradleException('NDK not configured')
diff --git a/playback/player/android/app/src/main/jni/Android.mk b/playback/player/android/app/src/main/jni/Android.mk
index 65e2044d99..593eaae368 100644
--- a/playback/player/android/app/src/main/jni/Android.mk
+++ b/playback/player/android/app/src/main/jni/Android.mk
@@ -9,25 +9,22 @@ LOCAL_SHARED_LIBRARIES := gstreamer_android
 LOCAL_LDLIBS := -llog -landroid
 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
 $(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/
diff --git a/playback/player/android/app/src/main/jni/Application.mk b/playback/player/android/app/src/main/jni/Application.mk
index 87c0990478..9e74937f5a 100644
--- a/playback/player/android/app/src/main/jni/Application.mk
+++ b/playback/player/android/app/src/main/jni/Application.mk
@@ -1 +1,2 @@
 APP_PLATFORM = 15
+APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64
diff --git a/playback/player/android/gradle.properties b/playback/player/android/gradle.properties
index 1d3591c8a4..a2a6ee4bd2 100644
--- a/playback/player/android/gradle.properties
+++ b/playback/player/android/gradle.properties
@@ -15,4 +15,5 @@
 # When configured, Gradle will run in incubating parallel mode.
 # 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
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+gstAndroidRoot=/home/slomo/Projects/gstreamer/head/gst-examples/playback/player/gst-android