Browse Source

Fix lua copy and add hrtfs

3.3.x
Geoffrey Métais 6 years ago
committed by Nicolas Pomepuy
parent
commit
25c76603c9
  1. 1
      .gitignore
  2. 25
      application/app/build.gradle
  3. 19
      application/vlc-android/build.gradle

1
.gitignore

@ -1,6 +1,7 @@
# VLC
/vlc/
/toolchains/
application/app/src/main/assets/
#medialibrary
medialibrary/medialibrary

25
application/app/build.gradle

@ -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 {

19
application/vlc-android/build.gradle

@ -13,18 +13,6 @@ android {
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(),

Loading…
Cancel
Save