Skip to content
Snippets Groups Projects
Commit 25c76603 authored by Geoffrey Métais's avatar Geoffrey Métais Committed by Nicolas Pomepuy
Browse files

Fix lua copy and add hrtfs

parent 39267822
No related branches found
No related tags found
1 merge request!544Binaural sound support
# VLC
/vlc/
/toolchains/
application/app/src/main/assets/
#medialibrary
medialibrary/medialibrary
......
......@@ -11,6 +11,23 @@ android {
pickFirst 'lib/x86_64/libc++_shared.so'
}
task hrtfsCopy(type: Copy) {
from '../../vlc/share/hrtfs'
into 'src/main/assets/hrtfs'
}
task luaPlaylistCopy(type: Copy) {
from '../../vlc/share/lua/playlist'
into 'src/main/assets/lua/playlist'
exclude '**/*.txt'
}
task luaMetaCopy(type: Copy) {
from '../../vlc/share/lua/meta'
into 'src/main/assets/lua/meta'
exclude '**/*.txt'
}
dexOptions {
maxProcessCount 8
javaMaxHeapSize "4g"
......@@ -41,6 +58,14 @@ android {
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
tasks.whenTaskAdded { task ->
if (task.name.startsWith('merge')) {
task.dependsOn hrtfsCopy
task.dependsOn luaPlaylistCopy
task.dependsOn luaMetaCopy
}
}
}
signingConfigs {
......
......@@ -12,18 +12,6 @@ android {
dataBinding {
enabled = true
}
task luaPlaylistCopy(type: Copy) {
from '../vlc/share/lua/playlist'
into 'assets/lua/playlist'
exclude '**/*.txt'
}
task luaMetaCopy(type: Copy) {
from '../vlc/share/lua/meta'
into 'assets/lua/meta'
exclude '**/*.txt'
}
packagingOptions {
pickFirst '**/*.so'
......@@ -49,13 +37,6 @@ android {
versionName rootProject.ext.versionName
vectorDrawables.useSupportLibrary = true
tasks.whenTaskAdded { task ->
if (task.name.startsWith('merge')) {
task.dependsOn luaPlaylistCopy
task.dependsOn luaMetaCopy
}
}
javaCompileOptions {
annotationProcessorOptions {
arguments = ["room.schemaLocation": "$projectDir/assets/schemas".toString(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment