Merge pull request #5192 from cb1kenobi/timob-16092_3_2_X

[TIMOB-16092] Fixed bug with build dir libs not being copied into final ...
tidev · Jan 7, 2014 · 9c726d0 · 9c726d0
2 parents 1fe55e7 + 2679897
commit 9c726d0
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js
@@ -3817,6 +3817,7 @@ AndroidBuilder.prototype.createUnsignedApk = function createUnsignedApk(next) {
 			}.bind(this);
 
 		try {
+			// add Titanium native modules
 			addNativeLibs(path.join(this.platformPath, 'native', 'libs'));
 		} catch (abi) {
 			// this should never be called since we already validated this
@@ -3832,9 +3833,15 @@ AndroidBuilder.prototype.createUnsignedApk = function createUnsignedApk(next) {
 			process.exit(1);
 		}
 
+		try {
+			// add native modules from the build dir's "libs" dir
+			addNativeLibs(path.join(this.buildDir, 'libs'));
+		} catch (e) {}
+
 		this.modules.forEach(function (m) {
 			if (m.native) {
 				try {
+					// add native modules for each module
 					addNativeLibs(path.join(m.modulePath, 'libs'));
 				} catch (abi) {
 					// this should never be called since we already validated this