From 77c341fea7f368f8b8a0a9c25cb7fb88a0fd47bb Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Thu, 21 May 2015 17:28:16 -0700
Subject: [PATCH] Fix the `meteor build` behavior since it was broken by
 Cordova 5.0 upgrade

The Cordova 5.0 is featuring Cordova Android 4.0, which now ships with a gradle project and not Ant.
---
 tools/commands-cordova.js |  5 +++--
 tools/commands.js         | 16 +++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/tools/commands-cordova.js b/tools/commands-cordova.js
index 66158a517c2..9ac899b3817 100644
--- a/tools/commands-cordova.js
+++ b/tools/commands-cordova.js
@@ -926,11 +926,12 @@ var buildCordova = function (projectContext, platforms, options) {
         // XXX a hack to reset the debuggable mode
         var manifest = files.readFile(manifestPath, 'utf8');
         manifest = manifest.replace(/android:debuggable=.(true|false)./g, '');
-        manifest = manifest.replace(/<application /g, '<application android:debuggable="' + !!options.debug + '" ');
+        if (options.debug)
+          manifest = manifest.replace(/<application /g, '<application android:debuggable="' + !!options.debug + '" ');
         files.writeFile(manifestPath, manifest, 'utf8');
 
         // XXX workaround the problem of cached apk invalidation
-        files.rm_recursive(files.pathJoin(androidBuildPath, 'ant-build'));
+        files.rm_recursive(files.pathJoin(androidBuildPath, 'build'));
       }
 
       if (!options.debug) {
diff --git a/tools/commands.js b/tools/commands.js
index 60ac0b05e47..1b4722ec552 100644
--- a/tools/commands.js
+++ b/tools/commands.js
@@ -947,11 +947,11 @@ var buildCommand = function (options) {
         "utf8");
     } else if (platformName === 'android') {
       files.cp_r(buildPath, files.pathJoin(platformPath, 'project'));
-      var apkPath = findApkPath(files.pathJoin(buildPath, 'ant-build'));
-      files.copyFile(apkPath, files.pathJoin(platformPath, 'unaligned.apk'));
+      var apkPath = findApkPath(files.pathJoin(buildPath, 'build'), options.debug);
+      files.copyFile(apkPath, files.pathJoin(platformPath, options.debug ? 'debug.apk' : 'release-unsigned.apk'));
       files.writeFile(
         files.pathJoin(platformPath, 'README'),
-        "This is an auto-generated Ant project for your Android application.\n\n" +
+        "This is an auto-generated Gradle project for your Android application.\n\n" +
         "Instructions for publishing your Android app to Play Store can be found at:\n" +
           "https://github.com/meteor/meteor/wiki/How-to-submit-your-Android-app-to-Play-Store\n",
         "utf8");
@@ -961,14 +961,8 @@ var buildCommand = function (options) {
   files.rm_recursive(buildDir);
 };
 
-var findApkPath = function (dirPath) {
-  var apkPath = _.find(files.readdir(dirPath), function (filePath) {
-    return files.pathExtname(filePath) === '.apk';
-  });
-
-  if (! apkPath)
-    throw new Error('The APK file for the Android build was not found.');
-  return files.pathJoin(dirPath, apkPath);
+var findApkPath = function (dirPath, debug) {
+  return files.pathJoin(dirPath, 'outputs', 'apk', debug ? 'android-debug.apk' : 'android-release-unsigned.apk');
 };
 
 ///////////////////////////////////////////////////////////////////////////////