[TIMOB-25353] Android: Allow Titanium modules to process module dependencies

android/cli/commands/_build.js

@@ -1490,7 +1490,7 @@ AndroidBuilder.prototype.validate = function validate(logger, config, cli) {
 	}
 
 	return function (callback) {
-		this.validateTiModules('android', this.deployType, function (err, modules) {
+		this.validateTiModules('android', this.deployType, function validateTiModulesCallback(err, modules) {
 			this.modules = modules.found;
 
 			this.commonJsModules = [];
@@ -1621,6 +1621,58 @@ process.exit(1);
 			this.modulesNativeHash = this.hash(nativeHashes.length ? nativeHashes.sort().join(',') : '');
 			this.modulesBindingsHash = this.hash(bindingsHashes.length ? bindingsHashes.sort().join(',') : '');
 
+			// check for any missing module dependencies
+			let unresolvedDependencies = [];
+			for (let module of this.nativeLibModules) {
+				const timoduleXmlFile = path.join(module.modulePath, 'timodule.xml'),
+					timodule = fs.existsSync(timoduleXmlFile) ? new tiappxml(timoduleXmlFile) : undefined;
+
+				if (timodule && Array.isArray(timodule.modules)) {
+					for (let dependency of timodule.modules) {
+						if (!dependency.platform || /^android$/.test(dependency.platform)) {
+
+							let missing = true;
+							for (let module of this.nativeLibModules) {
+								if (module.id === dependency.id) {
+									missing = false;
+									break;
+								}
+							}
+							if (missing) {
+								dependency.depended = module;
+
+								// attempt to include missing dependency
+								this.cli.tiapp.modules.push({
+									id: dependency.id,
+									version: dependency.version,
+									platform: [ 'android' ],
+									deployType: [ this.deployType ]
+								});
+
+								unresolvedDependencies.push(dependency);
+							}
+						}
+					}
+				}
+			}
+			if (unresolvedDependencies.length) {
+				/*
+				let msg = 'could not find required module dependencies:';
+		 		for (let dependency of unresolvedDependencies) {
+		 			msg += __('\n  id: %s  version: %s  platform: %s  required by %s',
+		 				dependency.id,
+		 				dependency.version ? dependency.version : 'latest',
+		 				dependency.platform ? dependency.platform : 'all',
+		 				dependency.depended.id);
+		 		}
+		 		logger.error(msg);
+		 		process.exit(1);
+		 		*/
+
+				// re-validate modules
+				return this.validateTiModules('android', this.deployType, validateTiModulesCallback.bind(this));
+			}
+
 			// check if we have any conflicting jars
 			const possibleConflicts = Object.keys(jarHashes).filter(function (jar) { return jarHashes[jar].length > 1; }); // eslint-disable-line max-statements-per-line
 			if (possibleConflicts.length) {

android/cli/commands/_buildModule.js

@@ -25,6 +25,7 @@ const AdmZip = require('adm-zip'),
 	markdown = require('markdown').markdown,
 	path = require('path'),
 	temp = require('temp'),
+	tiappxml = require('node-titanium-sdk/lib/tiappxml'),
 	util = require('util'),
 	wrench = require('wrench'),
 	spawn = require('child_process').spawn, // eslint-disable-line security/detect-child-process
@@ -266,17 +267,6 @@ AndroidModuleBuilder.prototype.initialize = function initialize(next) {
 	this.classPaths[this.androidCompileSDK.androidJar] = 1;
 	this.manifestFile = path.join(this.projectDir, 'manifest');
 
-	[ 'lib', 'modules', '' ].forEach(function (folder) {
-		var jarDir = path.join(this.platformPath, folder);
-
-		fs.existsSync(jarDir) && fs.readdirSync(jarDir).forEach(function (name) {
-			var file = path.join(jarDir, name);
-			if (/\.jar$/.test(name) && fs.existsSync(file)) {
-				this.classPaths[file] = 1;
-			}
-		}, this);
-	}, this);
-
 	this.dependencyJsonFile = path.join(this.platformPath, 'dependency.json');
 	this.templatesDir = path.join(this.platformPath, 'templates', 'build');
 	this.moduleIdSubDir = this.manifest.moduleid.split('.').join(path.sep);
@@ -293,6 +283,79 @@ AndroidModuleBuilder.prototype.initialize = function initialize(next) {
 	this.sharedHooksDir = path.resolve(this.projectDir, '..', 'hooks');
 
 	this.timoduleXmlFile = path.join(this.projectDir, 'timodule.xml');
+	this.timodule = fs.existsSync(this.timoduleXmlFile) ? new tiappxml(this.timoduleXmlFile) : undefined;
+	this.modulesDir = path.join(this.projectDir, 'modules', 'android');
+	this.globalModulesDir = path.join(this.globalModulesPath, 'android');
+
+	// process module dependencies
+	this.modules = this.timodule && !Array.isArray(this.timodule.modules) ? [] : this.timodule.modules.filter(function (m) {
+		if (!m.platform || /^android$/.test(m.platform)) {
+			var localPath = path.join(this.modulesDir, m.id),
+				globalPath = path.join(this.globalModulesDir, m.id);
+
+			function getModulePath (modulePath) {
+				var items = fs.readdirSync(modulePath);
+				if (m.version) {
+					for (var item of items) {
+						if (item === m.version) {
+							m.path = path.join(modulePath, m.version);
+							return true;
+						}
+					}
+				} else if (items.length) {
+					var latest = items[items.length - 1];
+					if (!latest.startsWith('.')) {
+						m.version = latest;
+						m.path = path.join(modulePath, m.version);
+						return true;
+					}
+				}
+				return false;
+			}
+
+			if ((fs.existsSync(localPath) && getModulePath(localPath))
+				|| (fs.existsSync(globalPath) && getModulePath(globalPath))) {
+				return true;
+			}
+		}
+		return false;
+	}.bind(this));
+
+	// obtain module dependency android archives for aar-transform to find
+	this.moduleAndroidLibraries = [];
+	function obtainModuleDependency (name, libPath) {
+		var file = path.join(libPath, name);
+		if (/\.aar$/.test(name) && fs.existsSync(file)) {
+			this.moduleAndroidLibraries.push({
+				aarPathAndFilename: String(file),
+				originType: 'Module'
+			});
+		}
+	}
+
+	for (let module of this.modules) {
+		var libPath = path.join(module.path, 'lib');
+		fs.existsSync(libPath) && fs.readdirSync(libPath).forEach(obtainModuleDependency, this);
+	}
+
+	// module java archive paths
+	this.jarPaths = [ path.join(this.platformPath, 'lib'), path.join(this.platformPath, 'modules'), this.platformPath ];
+
+	// module dependencies java archive paths
+	for (let module of this.modules) {
+		this.jarPaths.push(path.join(module.path));
+		this.jarPaths.push(path.join(module.path, 'lib'));
+	}
+
+	this.jarPaths.forEach(function (jarDir) {
+		fs.existsSync(jarDir) && fs.readdirSync(jarDir).forEach(function (name) {
+			var file = path.join(jarDir, name);
+			if (/\.jar$/.test(name) && fs.existsSync(file)) {
+				this.classPaths[file] = 1;
+			}
+		}, this);
+	}, this);
+
 	this.licenseFile = path.join(this.projectDir, 'LICENSE');
 	if (!fs.existsSync(this.licenseFile)) {
 		this.licenseFile = path.join(this.projectDir, '..', 'LICENSE');
@@ -376,7 +439,7 @@ AndroidModuleBuilder.prototype.processResources = function processResources(next
 	var mergedResPath = path.join(this.buildIntermediatesDir, 'res/merged');
 	var extraPackages = [];
 	var merge = function (src, dest) {
-		fs.readdirSync(src).forEach(function (filename) {
+		fs.existsSync(src) && fs.readdirSync(src).forEach(function (filename) {
 			var from = path.join(src, filename),
 				to = path.join(dest, filename);
 			if (fs.existsSync(from)) {

android/cli/hooks/aar-transform.js

@@ -114,12 +114,12 @@ function scanProjectAndStartTransform(builder, logger, callback) {
  * @param {Function} callback Function to call once the transform is complete
  */
 function scanModuleAndStartTransform(builder, logger, callback) {
-	const moduleAndroidLibraries = [];
+	const moduleAndroidLibraries = builder.moduleAndroidLibraries || [];
 	fs.readdirSync(builder.projLibDir).forEach(function (file) {
 		if (/\.aar/.test(file)) {
 			moduleAndroidLibraries.push({
 				aarPathAndFilename: path.join(builder.projLibDir, file),
-				originType: LIBRARY_ORIGIN_PORJECT
+				originType: LIBRARY_ORIGIN_MODULE
 			});
 		}
 	});
@@ -194,7 +194,7 @@ function transformAndroidLibraries(transformTasks, builder, buildVariant, logger
 					return done(null, hash);
 				}
 
-				logger.trace('Skipping ' + aarPathAndFilename.cyan + ' because it is a duplicate of ' + libraryHashMap[hash].aarPathAndFilename.cyan);
+				logger.trace('Skipping ' + aarPathAndFilename.cyan + ' because it is a duplicate of ' + libraryHashMap[hash].packageName.cyan);
 				done(new SkipLibraryError());
 			},
 
@@ -264,7 +264,7 @@ function transformAndroidLibraries(transformTasks, builder, buildVariant, logger
 				function formatDupeInfo(dupeLibraryInfo) {
 					var infoString = dupeLibraryInfo.task.aarPathAndFilename + ' (hash: ' + dupeLibraryInfo.sha256;
 					if (dupeLibraryInfo.task.originType === LIBRARY_ORIGIN_MODULE) {
-						infoString += ', origin: Module ' + dupeLibraryInfo.task.moduleInfo.id;
+						infoString += ', origin: Module';
 					} else if (dupeLibraryInfo.task.originType === LIBRARY_ORIGIN_PORJECT) {
 						infoString += ', origin: Project';
 					}

package.json

@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "adm-zip": "0.4.7",
-    "appc-aar-tools": "1.1.3",
+    "appc-aar-tools": "1.1.4",
     "appc-tasks": "^1.0.1",
     "archiver": "1.3.0",
     "async": "2.3.0",