CB-14240 - Cherry pick some android fixes from master to 7.1.x

[jcesarmobile]

Platforms affected

android

What does this PR do?

cherry pick some master fixes to 7.1.x branch

What testing has been done on this change?

Checklist

• Reported an issue in the JIRA database
• Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform affected.
• Added automated test coverage as appropriate for this change.

[janpio]

#450 as well maybe?

[jcesarmobile]

I tried and git told me it was already there, checked the code and it seems that it's really there, and git log in 7.1.x branch also shows it there. Not sure why when you do a branch compare it shows it as not included.

[codecov-io]

Codecov Report

Merging #469 into 7.1.x will increase coverage by 0.21%.
The diff coverage is 69.23%.

@@            Coverage Diff             @@
##            7.1.x     #469      +/-   ##
==========================================
+ Coverage   44.02%   44.24%   +0.21%     
==========================================
  Files          17       17              
  Lines        1708     1695      -13     
  Branches      316      312       -4     
==========================================
- Hits          752      750       -2     
+ Misses        956      945      -11

Impacted Files	Coverage Δ
bin/templates/cordova/Api.js	49.57% <ø> (+7.69%)	⬆️
bin/templates/cordova/lib/emulator.js	48.46% <0%> (-0.19%)	⬇️
bin/templates/cordova/lib/AndroidStudio.js	100% <100%> (+5.26%)	⬆️
bin/templates/cordova/lib/pluginHandlers.js	86.7% <80%> (+0.23%)	⬆️
bin/templates/cordova/lib/AndroidProject.js	42.6% <0%> (+1.73%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7a97fd7...d386d9c. Read the comment docs.

[janpio]

Oh, fun. Cherry picking is a surprising pain sometimes.

[janpio]

Good changes

[raphinesse]

#450 already was part of the last release

[brodycj]

I would personally favor marking 7.1.2-dev before cherry-picking the changes, like I did in GH-454, apache/cordova-ios#379, and other places. I think this should be fixed in cordova-coho doc.

[janpio]

Isn't it that way for master already? Probably nobody thought about releases from the version branches much.

[brodycj]

Merged by rebase now that I marked 7.1.2-dev in GH-470.

[brodycj]

Isn't it that way for master already?

Yes.

Probably nobody thought about releases from the version branches much.

Until now, yes.

[janpio]

Then it probably makes sense to be fixed in coho.

[brodycj]

I just raised https://issues.apache.org/jira/browse/CB-14249, don't know when I will get a chance to take care of this one. Further discussion should probably be there or on mailing list.