Copy project icons to Gradle project directory during Android Custom Build.

[amanj120]

Forward port of #39997

@m4gr3d tagging you for visibility

[akien-mga]

For the reference, a proposal that describes what you're aiming to implement and the various changes that are necessary for this would have been welcome (edit: There is one: godotengine/godot-proposals#342 (comment)). As it stands, there are a number of PRs for both 3.2 and master which all implement some steps for some feature without a clear overview.

I trust @m4gr3d to get the necessary overview and thus defer to his assessment for merging changes into master. For the 3.2 branch, I'll wait for everything to be implemented and tested. I'd suggest focusing on master and eventually make a PR with cherrypicks of all relevant commits (+ potential subsequent fixes) for the 3.2 branch when the feature has been fully implemented.

---

Edit: My bad, I see there is a detailed proposal in godotengine/godot-proposals#342 (comment) which explains the changes. So all good, I'm sorry for the misunderstanding. My point about focusing on master first is still valid though, 3.2 is a stable branch and the main focus there is on fixing bugs. New features can be added, but only once they're complete, not as WIP.

[amanj120]

@akien-mga Thank you for the advice. I will focus my attention on creating a fully tested and implemented Android App Bundle exporting option on the master branch. Once it works, I'll create a single, comprehensive, PR that cherry-picks all the changes to the 3.2 branch.

However, a single PR to backport all the changes from master to 3.2 will be very large (on the order of 500+ lines), will that be acceptable?

Also, should I close all the relevant PRs on the 3.2 branch that are open right now (#39864, #39998, #40182, #39997)?

[akien-mga]

However, a single PR to backport all the changes from master to 3.2 will be very large (on the order of 500+ lines), will that be acceptable?

As long as the commits are kept separate as they are in the current PRs (and easily identified as backports of the corresponding PRs in the master branch), it should be good.

But let's see what @m4gr3d thinks about it, if he prefers to have the individual 3.2 PRs kept and merged as is, that's OK too.

We discussed last week with @m4gr3d that to allow a better integration of new features in 3.2 without compromising the stability of the already released branch, we'd probably merge new features in specific feature branches (e.g. 3.2-android-app-bundle) with their own sets of official binaries to get some testing from the community before integrating it in the main 3.2 branch for the next maintenance release.

So actually we could do that now, we can create a dedicated branch and merge your existing 3.2 PRs in that branch, which can later be merged in 3.2. If that sounds good to you, I'll create that branch and we can edit the existing PRs to target that branch as base branch.

[amanj120]

So actually we could do that now, we can create a dedicated branch and merge your existing 3.2 PRs in that branch, which can later be merged in 3.2. If that sounds good to you, I'll create that branch and we can edit the existing PRs to target that branch as base branch.

I think that's a good solution.

[akien-mga]

Alright, here's the branch: https://github.com/godotengine/godot/tree/3.2-android-app-bundle

I merged #39864 and #39998.

#40182 depends on #40260 being merged first (and updated to match any changes).
And #39997 depends on this PR being merged first.

[m4gr3d]

Looks great!

[akien-mga]

Thanks!