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
7c19ec6c
Commit
7c19ec6c
authored
Jan 30, 2019
by
KyleWong
Committed by
Jonah Williams
Jan 30, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add2App: Fix crash resulted from hard-code module 'app' based resource copy. (#27154)
parent
6d20ff24
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
flutter.gradle
packages/flutter_tools/gradle/flutter.gradle
+9
-1
include_flutter.groovy.copy.tmpl
...s/module/android/library/include_flutter.groovy.copy.tmpl
+6
-0
No files found.
packages/flutter_tools/gradle/flutter.gradle
View file @
7c19ec6c
...
...
@@ -429,8 +429,16 @@ class FlutterPlugin implements Plugin<Project> {
}
if
(
packageAssets
)
{
String
mainModuleName
=
"app"
try
{
String
tmpModuleName
=
project
.
rootProject
.
ext
.
mainModuleName
if
(
tmpModuleName
!=
null
&&
!
tmpModuleName
.
empty
)
{
mainModuleName
=
tmpModuleName
}
}
catch
(
Exception
e
)
{
}
// Only include configurations that exist in parent project.
Task
mergeAssets
=
project
.
tasks
.
findByPath
(
":
app
:merge${variant.name.capitalize()}Assets"
)
Task
mergeAssets
=
project
.
tasks
.
findByPath
(
":
${mainModuleName}
:merge${variant.name.capitalize()}Assets"
)
if
(
mergeAssets
)
{
mergeAssets
.
dependsOn
(
copyFlutterAssetsTask
)
}
...
...
packages/flutter_tools/templates/module/android/library/include_flutter.groovy.copy.tmpl
View file @
7c19ec6c
...
...
@@ -19,6 +19,12 @@ plugins.each { name, path ->
}
gradle.getGradle().projectsLoaded { g ->
g.rootProject.beforeEvaluate { p ->
_mainModuleName = binding.variables['mainModuleName']
if (_mainModuleName != null && !_mainModuleName.empty) {
p.ext.mainModuleName = _mainModuleName
}
}
g.rootProject.afterEvaluate { p ->
p.subprojects { sp ->
if (sp.name != 'flutter') {
...
...
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