[Android] Fix lua copy and add hrtfs

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Fri Apr 10 18:06:35 2020 +0200| [25c76603c9e64742759533d70147db131975c24d] | committer: Nicolas Pomepuy

Fix lua copy and add hrtfs

> https://code.videolan.org/videolan/vlc-android/commit/25c76603c9e64742759533d70147db131975c24d
---

 .gitignore                           |  1 +
 application/app/build.gradle         | 25 +++++++++++++++++++++++++
 application/vlc-android/build.gradle | 19 -------------------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9753e9165..23c65c1cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # VLC
 /vlc/
 /toolchains/
+application/app/src/main/assets/
 
 #medialibrary
 medialibrary/medialibrary
diff --git a/application/app/build.gradle b/application/app/build.gradle
index 870e7db3c..f0d88f4ac 100644
--- a/application/app/build.gradle
+++ b/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 {
diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle
index 0f2b12050..f5fc5f44f 100644
--- a/application/vlc-android/build.gradle
+++ b/application/vlc-android/build.gradle
@@ -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(),