Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
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
community
godot
Commits
be22a1f9
Commit
be22a1f9
authored
Jun 01, 2020
by
PouleyKetchoupp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix inconsistent error messages with Android custom export templates
parent
34ef9a51
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
export.cpp
platform/android/export/export.cpp
+13
-4
No files found.
platform/android/export/export.cpp
View file @
be22a1f9
...
...
@@ -1729,23 +1729,32 @@ public:
// Look for export templates (first official, and if defined custom templates).
if
(
!
bool
(
p_preset
->
get
(
"custom_template/use_custom_build"
)))
{
bool
dvalid
=
exists_export_template
(
"android_debug.apk"
,
&
err
);
bool
rvalid
=
exists_export_template
(
"android_release.apk"
,
&
err
);
String
template_err
;
bool
dvalid
=
false
;
bool
rvalid
=
false
;
if
(
p_preset
->
get
(
"custom_template/debug"
)
!=
""
)
{
dvalid
=
FileAccess
::
exists
(
p_preset
->
get
(
"custom_template/debug"
));
if
(
!
dvalid
)
{
err
+=
TTR
(
"Custom debug template not found."
)
+
"
\n
"
;
template_
err
+=
TTR
(
"Custom debug template not found."
)
+
"
\n
"
;
}
}
else
{
dvalid
=
exists_export_template
(
"android_debug.apk"
,
&
template_err
);
}
if
(
p_preset
->
get
(
"custom_template/release"
)
!=
""
)
{
rvalid
=
FileAccess
::
exists
(
p_preset
->
get
(
"custom_template/release"
));
if
(
!
rvalid
)
{
err
+=
TTR
(
"Custom release template not found."
)
+
"
\n
"
;
template_
err
+=
TTR
(
"Custom release template not found."
)
+
"
\n
"
;
}
}
else
{
rvalid
=
exists_export_template
(
"android_release.apk"
,
&
template_err
);
}
valid
=
dvalid
||
rvalid
;
if
(
!
valid
)
{
err
+=
template_err
;
}
}
else
{
valid
=
exists_export_template
(
"android_source.zip"
,
&
err
);
}
...
...
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