Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Declare libgstreamer_android as prebuilt library

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2018-09-24 15:50:45 +02:00
parent e3c98802eb
commit 991fdbe5d4
3 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
support/android/apk/jni/Android.mk
View file

@ -20,3 +20,9 @@ LOCAL_PATH:= $(SERVO_TARGET_DIR)
LOCAL_MODULE := servojni LOCAL_MODULE := servojni
LOCAL_SRC_FILES := libsimpleservo.so LOCAL_SRC_FILES := libsimpleservo.so
include $(PREBUILT_SHARED_LIBRARY) 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)

2
support/android/apk/jni/Application.mk
View file

@ -1,4 +1,4 @@
NDK_TOOLCHAIN_VERSION := 4.9 NDK_TOOLCHAIN_VERSION := 4.9
APP_MODULES := c++_shared servojni APP_MODULES := c++_shared servojni gstreamer
APP_PLATFORM := android-18 APP_PLATFORM := android-18
APP_STL:= c++_shared APP_STL:= c++_shared

22
support/android/apk/servoview/build.gradle
View file

@ -157,9 +157,9 @@ android {
} }
def taskName = "ndkbuild" + compileTask.name def taskName = "ndkbuild" + compileTask.name
def debug = compileTask.name.contains("Debug")
def arch = matcher.group(1)
tasks.create(name: taskName, type: Exec) { tasks.create(name: taskName, type: Exec) {
def debug = compileTask.name.contains("Debug")
def arch = matcher.group(1)
commandLine getNdkDir(), commandLine getNdkDir(),
'APP_BUILD_SCRIPT=../jni/Android.mk', 'APP_BUILD_SCRIPT=../jni/Android.mk',
'NDK_APPLICATION_MK=../jni/Application.mk', 'NDK_APPLICATION_MK=../jni/Application.mk',
@ -170,23 +170,7 @@ android {
'SERVO_TARGET_DIR=' + getTargetDir(debug, arch) 'SERVO_TARGET_DIR=' + getTargetDir(debug, arch)
} }
def src = getTargetDir(debug, arch) + compileTask.dependsOn taskName
'/../../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
} }