From 7f849ac66772e771b93682c0d784dc74e5a7b8f6 Mon Sep 17 00:00:00 2001
From: JohnE <j@us3.co>
Date: Thu, 5 Mar 2015 13:52:41 -0800
Subject: [PATCH] updated paths

---
 .bash_android | 18 +++++++++---------
 .bash_mac     |  9 +++++----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.bash_android b/.bash_android
index 7a0b7a6..12dfc2c 100644
--- a/.bash_android
+++ b/.bash_android
@@ -2,34 +2,34 @@
 # set the path to android executables
 #
 
-ANDROID_SDK_HOME='/Volumes/D1/dev/android-sdk'
+ANDROID_SDK_HOME='/Applications/android-dev/android-sdk-macosx'
+ANDROID_NDK='/Applications/android-dev/android-ndk-r10d'
 JAVA_HOME='/usr/local/bin/javahome'
 ANT_HOME=' /usr/local/Cellar/ant/1.9.4'
-#
-#ln -s /Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home /usr/local/bin/javahome
+# ln -s /Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home /usr/local/bin/javahome
 
-# binaries
+# path to binaries
 export JAVA_BIN=$JAVA_HOME/bin
 export ANT_BIN=$ANT_HOME/bin
 export PATH=$ANT_BIN:$JAVA_BIN:$PATH
 
-# used by build tools (ant)
+# environment vars -- used by build tools (ant)
 export JAVA_HOME=$JAVA_HOME
 export ANT_HOME=$ANT_HOME
-
-# used by ant scripts
 export ANDROID_SDK_HOME=$ANDROID_SDK_HOME
 export ANDROID_HOME=$ANDROID_SDK_HOME
 
-# set path to android tools
+# set path to android tool binaries
 export PATH=$ANDROID_SDK_HOME/build-tools/android-4.4.2:$PATH
 export PATH=$ANDROID_SDK_HOME/platform-tools:$PATH
 export PATH=$ANDROID_SDK_HOME/tools:$PATH
 
+# ndk tools
+export PATH=$ANDROID_NDK:$PATH
+
 ### ### ###
 ### backup the android app
 ### next convert to .tar format
-
 alias adbback='adb backup -f myAppBackup.ab' #com.corp.appName
 alias adconv="dd if=myAppBackup.ab bs=24 skip=1 | $OSSL zlib -d > myAppBackup.tar"
 
diff --git a/.bash_mac b/.bash_mac
index 8a095de..e078901 100644
--- a/.bash_mac
+++ b/.bash_mac
@@ -1,14 +1,15 @@
 # brew openssl
 alias ossl='/usr/local/Cellar/openssl/1.0.2/bin/openssl'
+export OSSL=/usr/local/Cellar/openssl/1.0.2/bin/openssl
 
 # Mac Shortcuts
 alias eject='drutil tray eject'
 
-# dev
+#dev
+alias cdev='/Volumes/malloc-dev'
 alias cddev='cd /Volumes/MAVERICKS/Users/j3g/dev'
 
 # alias subl='open -a "Sublime Text 2"'
-alias subl='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
-alias subl3='/Applications/Sublime\ Text\ 3.app/Contents/SharedSupport/bin/subl'
+alias subl2='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
+alias subl='/Applications/Sublime\ Text\ 3.app/Contents/SharedSupport/bin/subl'
 
-export OSSL=/usr/local/Cellar/openssl/1.0.2/bin/openssl