Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix exporting Android APPLICATION_ATTRIBS (3.X) #69024

Conversation

Gromph
Copy link
Contributor

@Gromph Gromph commented Nov 22, 2022

I needed to add a tag to the inside of <application ...> in AndroidManifest.xml
I noticed that godot\platform\android\export\export_plugin.cpp did appear to support adding a [application_attribs] section to AndroidManfiest.conf. Which should then get inserted into <application ...> in AndroidManifest.xml

But it didn't work. The reason why is when export_plugin.cpp parses AndroidManifest.conf it upper cases the section names: "APPLICATION_ATTRIBS", but then later it was looking up using lower case "application_attribs"

So the simple fix was to upper case "APPLICATION_ATTRIBS" in code

Submitting pull request only against version 3.x because export_plugin.cpp in Master appears to be significantly different.

@Gromph Gromph requested a review from a team as a code owner November 22, 2022 20:29
@akien-mga akien-mga added this to the 3.6 milestone Nov 22, 2022
@akien-mga akien-mga added the cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release label Nov 22, 2022
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks correct to me.

@akien-mga akien-mga merged commit 429225c into godotengine:3.x Nov 24, 2022
@akien-mga
Copy link
Member

Thanks!

@timothyqiu
Copy link
Member

Cherry-picked for 3.5.2

@timothyqiu timothyqiu removed the cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release label Dec 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants