Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
528
Issue boards
Milestones
Wiki
Code
Merge requests
14
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
25c76603
Commit
25c76603
authored
4 years ago
by
Geoffrey Métais
Committed by
Nicolas Pomepuy
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix lua copy and add hrtfs
parent
39267822
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!544
Binaural sound support
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
application/app/build.gradle
+25
-0
25 additions, 0 deletions
application/app/build.gradle
application/vlc-android/build.gradle
+0
-19
0 additions, 19 deletions
application/vlc-android/build.gradle
with
26 additions
and
19 deletions
.gitignore
+
1
−
0
View file @
25c76603
# VLC
/vlc/
/toolchains/
application/app/src/main/assets/
#medialibrary
medialibrary/medialibrary
...
...
This diff is collapsed.
Click to expand it.
application/app/build.gradle
+
25
−
0
View file @
25c76603
...
...
@@ -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
{
...
...
This diff is collapsed.
Click to expand it.
application/vlc-android/build.gradle
+
0
−
19
View file @
25c76603
...
...
@@ -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
(),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment