build(android): rework merging of external library's resources #11094
Conversation
Rework the merging of third party native libraries resources.
Tests:
|
|
@ypbnv Given that this is an Android fix/improvement, shouldn't this be scheduled for 8.3.0 milestone/release? |
|
@sgtcoolguy Ah, my bad. I will change it. BTW this change may be irrelevant once we move to using |
android/cli/lib/base-builder.js
Outdated
| }); | ||
| nodes[node.tagName][n].appendChild(nodeChild.cloneNode(true)); | ||
| }); | ||
| _t.logger.warn(__('Merging XML node %s in file %s', String(n).cyan, dest.cyan)); |
There was a problem hiding this comment.
This has been bothering me for ages, but i think this should be debug rather than warn. Also move it back to the top before doing the actual merging otherwise it could cause confusion when something goes wrong during the merge and the last log was for a completely different merge operation.
android/cli/lib/base-builder.js
Outdated
| // We have a node with the same name. Merging as follows: | ||
| // Nodes with the same name get overwritten to maintain backwards compatiblity. | ||
| // Nodes with different name are appended to the parent node. | ||
| xml.forEachElement(node, function (nodeChild) { |
There was a problem hiding this comment.
| xml.forEachElement(node, function (nodeChild) { | |
| xml.forEachElement(node, function (childNode) { |
|
@janvennemann Updated. |
jquick-axway
changed the title
|
FR Passed. |
JIRA: https://jira.appcelerator.org/browse/TIMOB-27252
Description:
Rework the merging of third party native libraries resources. In order to try to keep backwards compatibility the merging now:
Test case:
There is an archive in the JIRA ticket with a version of a third party native library. Put the AAR files under
app/platform/androidfor an Alloy project and build the project.