make the change simpler, just include the file in npm

coderedhead · May 28, 2013 · e697fa3 · e697fa3
1 parent e14dd0b
commit e697fa3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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