[TIMOB-24834] Adjust value resources pattern for module compatibilty (#…

…9374)

The pattern used to detect value resources was only working for Android libraries extracted by Hyperloop. With this fix, resources from both Hyperloop and module provided Android libraries are properly handled.

android/cli/lib/base-builder.js

@@ -73,7 +73,7 @@ AndroidBaseBuilder.prototype.writeXmlFile = function writeXmlFile(srcOrDoc, dest
 	} else {
 		// Resource sets under a qualifier all need to be merged into a single values
 		// file so we adjust the destination path here if necessary
-		var valueResourcesPattern = /res\/(values(?:-[^/]+)?)\/.*/i;
+		var valueResourcesPattern = new RegExp('(values(?:-[^' + path.sep + ']+)?)' + path.sep + '[^' + path.sep + ']+$', 'i');
 		var match = dest.match(valueResourcesPattern);
 		if (match !== null) {
 			var resourceQualifier = match[1];