From 991fdbe5d46e41d14e9b617f30ccf7192d4d3bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= <ferjmoreno@gmail.com>
Date: Mon, 24 Sep 2018 15:50:45 +0200
Subject: [PATCH] Declare libgstreamer_android as prebuilt library

---
 support/android/apk/jni/Android.mk         |  6 ++++++
 support/android/apk/jni/Application.mk     |  2 +-
 support/android/apk/servoview/build.gradle | 22 +++-------------------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/support/android/apk/jni/Android.mk b/support/android/apk/jni/Android.mk
index eac2eac79a3..20a4de2d4b2 100644
--- a/support/android/apk/jni/Android.mk
+++ b/support/android/apk/jni/Android.mk
@@ -20,3 +20,9 @@ LOCAL_PATH:= $(SERVO_TARGET_DIR)
 LOCAL_MODULE := servojni
 LOCAL_SRC_FILES := libsimpleservo.so
 include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_PATH:= $(SERVO_TARGET_DIR)/../../gstreamer/gst-build-$(APP_ABI)
+LOCAL_MODULE := gstreamer
+LOCAL_SRC_FILES := libgstreamer_android.so
+include $(PREBUILT_SHARED_LIBRARY)
diff --git a/support/android/apk/jni/Application.mk b/support/android/apk/jni/Application.mk
index 3d71715554b..e88ad8605f7 100644
--- a/support/android/apk/jni/Application.mk
+++ b/support/android/apk/jni/Application.mk
@@ -1,4 +1,4 @@
 NDK_TOOLCHAIN_VERSION := 4.9
-APP_MODULES := c++_shared servojni
+APP_MODULES := c++_shared servojni gstreamer
 APP_PLATFORM := android-18
 APP_STL:= c++_shared
diff --git a/support/android/apk/servoview/build.gradle b/support/android/apk/servoview/build.gradle
index dc25ec1a4d0..cf227e6a52f 100644
--- a/support/android/apk/servoview/build.gradle
+++ b/support/android/apk/servoview/build.gradle
@@ -157,9 +157,9 @@ android {
             }
 
             def taskName = "ndkbuild" + compileTask.name
-            def debug = compileTask.name.contains("Debug")
-            def arch = matcher.group(1)
             tasks.create(name: taskName, type: Exec) {
+                def debug = compileTask.name.contains("Debug")
+                def arch = matcher.group(1)
                 commandLine getNdkDir(),
                         'APP_BUILD_SCRIPT=../jni/Android.mk',
                         'NDK_APPLICATION_MK=../jni/Application.mk',
@@ -170,23 +170,7 @@ android {
                         'SERVO_TARGET_DIR=' + getTargetDir(debug, arch)
             }
 
-            def src = getTargetDir(debug, arch) +
-                      '/../../gstreamer/gst-build-' +
-                      getNDKAbi(arch) +
-                      '/libgstreamer_android.so'
-            Task copyGStreamerTask = project.task("copyGStreamerTask${compileTask.name}", type: Copy) {
-                from src
-                into getJniLibsPath(debug, arch) + '/' + getNDKAbi(arch) + '/'
-            }
-
-            Task copyGStreamerObjTask = project.task("copyGStreamerTask${compileTask.name}Obj", type: Copy) {
-                from src
-                into getTargetDir(debug, arch) + '/apk/obj/local/' + getNDKAbi(arch) + '/'
-            }
-
-            copyGStreamerObjTask.dependsOn taskName
-            copyGStreamerTask.dependsOn copyGStreamerObjTask
-            compileTask.dependsOn copyGStreamerTask
+            compileTask.dependsOn taskName
     }