Updating readme and CLI options to support linux+android development. (…

…#24)

README.md

@@ -17,28 +17,32 @@
 
     ```
     ./setup_macos.sh
+
+    echo "ndk.dir=$NDK_HOME" > android/local.properties
+    echo "sdk.dir=$ANDROID_HOME" >> android/local.properties
     ```
 
 - linux
 
     ```
     ./setup_linux.sh
+
+    echo "ndk.dir=$NDK_HOME" > android/local.properties
+    echo "sdk.dir=$ANDROID_HOME" >> android/local.properties
     ```
 
 ### usage
 
 - iOS
 
     ```
-    make -C rust/signer ios
-    react-native run-ios
+    npm run ios
     ```
 
 - Android
 
     ```
-    make -C rust/signer android
-    react-native run-android
+    npm run android
     ```
 
 ### Example

create-ndk-standalone.sh

@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 # based on https://github.com/kennytm/rust-ios-android
 
@@ -13,7 +13,7 @@ fi
 MAKER="$NDK_HOME/build/tools/make_standalone_toolchain.py"
 
 if [ -x "$MAKER" ]; then
-    MAKER="$(brew --prefix android-ndk)/build/tools/make_standalone_toolchain.py"
+    MAKER="$NDK_HOME/build/tools/make_standalone_toolchain.py"
 fi
 
 if [ -x "$MAKER" ]; then

package.json

@@ -3,8 +3,12 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "build-rust": "cd rust/signer && make ios",
-    "start": "npm run build-rust && node node_modules/react-native/local-cli/cli.js run-ios",
+    "build-rust-ios": "cd rust/signer && make ios",
+    "ios": "npm run build-rust-ios && npm run cli run-ios",
+    "build-rust-android": "cd rust/signer && make android",
+    "android": "npm run build-rust-android && npm run cli run-android",
+    "cli": "node node_modules/react-native/local-cli/cli.js",
+    "start": "npm run ios",
     "test": "jest",
     "lint": "standard",
     "commit": "commit-wizard"

setup_linux.sh

@@ -1,5 +1,7 @@
 #! /bin/bash
 
+set -e
+
 # android
 multirust add-target stable aarch64-linux-android
 multirust add-target stable armv7-linux-androideabi

setup_macos.sh

@@ -1,5 +1,7 @@
 #! /bin/bash
 
+set -e
+
 # ios
 multirust add-target stable i386-apple-ios
 multirust add-target stable x86_64-apple-ios