Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
skiko
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuqiang
skiko
Commits
d3de3cfc
Commit
d3de3cfc
authored
Aug 21, 2020
by
Alexey Tsvetkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get rid of copying skia in case SKIA_DIR is provided
parent
a43e971b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
build.gradle.kts
skiko/build.gradle.kts
+11
-9
No files found.
skiko/build.gradle.kts
View file @
d3de3cfc
...
...
@@ -82,19 +82,21 @@ fun AbstractCopyTask.configureSkiaCopy(targetDir: File) {
}
val
skiaDir
=
run
{
val
targetDir
=
properties
.
dependenciesDir
.
resolve
(
"skia/skia"
)
val
taskProvider
=
if
(
properties
.
skiaDir
!=
null
)
{
tasks
.
register
(
"syncSkia"
,
Sync
::
class
)
{
from
(
properties
.
skiaDir
!!
.
absoluteFile
)
configureSkiaCopy
(
targetDir
)
}
if
(
properties
.
skiaDir
!=
null
)
{
tasks
.
register
(
"skiaDir"
,
DefaultTask
::
class
)
{
// dummy task to simplify usage of the resulting provider (see `else` branch)
// if a file provider is not created from a task provider,
// then it cannot be used instead of a task in `dependsOn` clauses of other tasks.
// e.g. the resulting `skiaDir` could not be used in `dependsOn` of CppCompile configuration
enabled
=
false
}.
map
{
properties
.
skiaDir
!!
}
}
else
{
val
targetDir
=
properties
.
dependenciesDir
.
resolve
(
"skia/skia"
)
tasks
.
register
(
"unzipSkia"
,
Copy
::
class
)
{
from
(
skiaZip
.
map
{
zipTree
(
it
)
})
configureSkiaCopy
(
targetDir
)
}
}
.
map
{
targetDir
}
}
taskProvider
.
map
{
targetDir
}
}
val
skijaZip
=
run
{
...
...
@@ -111,7 +113,7 @@ val skijaZip = run {
val
skijaDir
=
run
{
if
(
properties
.
skijaDir
!=
null
)
{
tasks
.
register
(
"
unzipSkija"
,
Copy
::
class
)
{
tasks
.
register
(
"
skijaDir"
,
DefaultTask
::
class
)
{
enabled
=
false
}.
map
{
properties
.
skijaDir
!!
}
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment