Consider arch when looking for compatible dist.

[Aralox]

Cache self.dist so it isn't calculated multiple times (e.g. wrapper_func in toolchain).

Current problem scenario:

• I build for arm
• I build the same project for x86. p4a uses existing distribution and packages arm libraries into the apk instead of recompiling project for x86

I also modified _dist() as it was getting called multiple times, causing the dist search (and log output) twice.

[AndreMiras]

Thank you for your contribution 🍺
I didn't get time to really wrap my head around it and play with it yet. Just left a couple of comments

[Aralox]

This pr isn't urgent. Workaround is to run p4a clean_dists between compiling for different architectures. I think the other pr currently in progress for upgrading to ndk 19 might already take this into account.

[AndreMiras]

Hi @Aralox is it still relevant after changes from #1722 ?
If I understood correctly, we can verify this by compiling for two different archs without running a clean between and checking if the APKs run OK on both. If the issue is still here, the second arch we build for would have compiled dists from the previous one hence should crash, correct?

[Aralox]

Hi Andre yes I think that's exactly it. I haven't really kept up with the progress of this project so I'm not sure if the other PR addresses this (it probably does), but yeah that would be the verification. Feel free to close this PR if unnecessary. Cheers :)

[inclement]

@AndreMiras As far as I can see, #1722 doesn't affect this and it's still an issue, am I missing something?

[opacam]

Yeah, agree with @inclement, I don't see any conflict with the NDK-r19 migration thing...but I just now realize that this will probably conflict with #1926 (as the author of this last one, no problem at all, I will fix conflicts if convenient 😉).

[inclement]

I'm dealing with this in a new PR. I'm considering it urgent for the next release.

[opacam]

@inclement, good to know 👍, feel free to use the commits I made at #1926, related with this arch problem, I see two:

• Check android_api and archs when reusing dist
• Add an arch suffix to our dists

Of course, feel free to implement it whatever way you want, you may have a better idea 😄

[inclement]

@opacam I'm feeling inclined to make a simpler PR that addresses just this for now, in a slightly different way, with #1926 left to merge for the next release. I don't want to merge #1926 quite yet because I'm concerned it may be a little overcomplicated. I'll add some thoughts about that later.

[opacam]

@inclement, no problem at all, I agree that #1926 complicates things... if we can slim it in some way better for all of us 😉

so go for this new PR 👍!

[inclement]

Closing as I think this was resolved elsewhere, but thanks for the PR.