From e697fa3b5be98050dbe5ba323a8de8d92caca80e Mon Sep 17 00:00:00 2001
From: Jonathan Lipps <jlipps@gmail.com>
Date: Tue, 28 May 2013 13:49:34 -0700
Subject: [PATCH] make the change simpler, just include the file in npm

---
 .npmignore     | 2 +-
 android/adb.js | 2 +-
 reset.sh       | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.npmignore b/.npmignore
index 4d185c5d4..a54dde4de 100644
--- a/.npmignore
+++ b/.npmignore
@@ -5,7 +5,7 @@ sample-code/
 test/
 android/bootstrap/bin/
 android/bootstrap/target/
-app/android/AndroidManifest*
+app/android/AndroidManifest.xml.apk
 _vimrc_local.vim
 *.swp
 *.swo
diff --git a/android/adb.js b/android/adb.js
index 39c2041ea..c4aba725c 100644
--- a/android/adb.js
+++ b/android/adb.js
@@ -144,7 +144,7 @@ ADB.prototype.buildFastReset = function(skipAppSign, cb) {
     , targetAPK = me.apkPath
     , cleanAPKSrc = path.resolve(__dirname, '../app/android/Clean.apk')
     , newPackage = me.appPackage + '.clean'
-    , srcManifest = path.resolve(__dirname, '../build/android_bootstrap/AndroidManifest.xml.src')
+    , srcManifest = path.resolve(__dirname, '../app/android/AndroidManifest.xml.src')
     , dstManifest = srcManifest.substr(0, srcManifest.length - '.src'.length);
 
   fs.writeFileSync(dstManifest, fs.readFileSync(srcManifest, "utf8"), "utf8");
diff --git a/reset.sh b/reset.sh
index d6dad4a43..ae06e6492 100755
--- a/reset.sh
+++ b/reset.sh
@@ -133,8 +133,6 @@ reset_android() {
     run_cmd $grunt configAndroidBootstrap
     echo "* Building Android bootstrap"
     run_cmd $grunt buildAndroidBootstrap
-    echo "* Copying manifest src"
-    run_cmd cp ./app/android/AndroidManifest.xml.src ./build/android_bootstrap
     if $include_dev ; then
         reset_apidemos
     fi