Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
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
abdullh.alsoleman
Front-End
Commits
4fc5048e
Unverified
Commit
4fc5048e
authored
Sep 06, 2018
by
Jason Simmons
Committed by
GitHub
Sep 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gradle: add a dependency on the task that generates the x86 jar instead of the jar file (#21466)
parent
358822e6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
flutter.gradle
packages/flutter_tools/gradle/flutter.gradle
+5
-5
No files found.
packages/flutter_tools/gradle/flutter.gradle
View file @
4fc5048e
...
...
@@ -152,7 +152,7 @@ class FlutterPlugin implements Plugin<Project> {
// Add x86/x86_64 native library. Debug mode only, for now.
flutterX86Jar
=
project
.
file
(
"${project.buildDir}/${AndroidProject.FD_INTERMEDIATES}/flutter/flutter-x86.jar"
)
project
.
tasks
.
create
(
"flutterBuildX86Jar"
,
Jar
)
{
Task
flutterX86JarTask
=
project
.
tasks
.
create
(
"flutterBuildX86Jar"
,
Jar
)
{
destinationDir
flutterX86Jar
.
parentFile
archiveName
flutterX86Jar
.
name
from
(
"${flutterRoot}/bin/cache/artifacts/engine/android-x86/libflutter.so"
)
{
...
...
@@ -164,8 +164,8 @@ class FlutterPlugin implements Plugin<Project> {
}
// Add flutter.jar dependencies to all <buildType>Api configurations, including custom ones
// added after applying the Flutter plugin.
project
.
android
.
buildTypes
.
each
{
addFlutterJarApiDependency
(
project
,
it
)
}
project
.
android
.
buildTypes
.
whenObjectAdded
{
addFlutterJarApiDependency
(
project
,
it
)
}
project
.
android
.
buildTypes
.
each
{
addFlutterJarApiDependency
(
project
,
it
,
flutterX86JarTask
)
}
project
.
android
.
buildTypes
.
whenObjectAdded
{
addFlutterJarApiDependency
(
project
,
it
,
flutterX86JarTask
)
}
}
project
.
extensions
.
create
(
"flutter"
,
FlutterExtension
)
...
...
@@ -219,7 +219,7 @@ class FlutterPlugin implements Plugin<Project> {
*
* Note: The BuildType DSL type is not public, and is therefore omitted from the signature.
*/
private
void
addFlutterJarApiDependency
(
Project
project
,
buildType
)
{
private
void
addFlutterJarApiDependency
(
Project
project
,
buildType
,
Task
flutterX86JarTask
)
{
project
.
dependencies
{
String
configuration
;
if
(
project
.
getConfigurations
().
findByName
(
"api"
))
{
...
...
@@ -230,7 +230,7 @@ class FlutterPlugin implements Plugin<Project> {
add
(
configuration
,
project
.
files
{
String
buildMode
=
buildModeFor
(
buildType
)
if
(
buildMode
==
"debug"
)
{
[
flutterX86Jar
,
debugFlutterJar
]
[
flutterX86Jar
Task
,
debugFlutterJar
]
}
else
if
(
buildMode
==
"profile"
)
{
profileFlutterJar
}
else
if
(
buildMode
==
"dynamicProfile"
)
{
...
...
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