status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

nix: fix passing of env vars to release-android expression

This commit is contained in:
Pedro Pombeiro 2019-11-13 12:01:48 +01:00
parent 2ed62e53eb
commit a71500b312
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
View File

@ -317,10 +317,10 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
String finalConfig = prepareDirAndUpdateConfig(config);
String result = Statusgo.saveAccountAndLogin(accountData, password, finalConfig, subAccountsData);
if (result.startsWith("{\"error\":\"\"")) {
Log.d(TAG, "StartNode result: " + result);
Log.d(TAG, "saveAccountAndLogin result: " + result);
Log.d(TAG, "Geth node started");
} else {
Log.e(TAG, "StartNode failed: " + result);
Log.e(TAG, "saveAccountAndLogin failed: " + result);
}
}
@ -330,10 +330,10 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
String finalConfig = prepareDirAndUpdateConfig(config);
String result = Statusgo.saveAccountAndLoginWithKeycard(accountData, password, finalConfig, chatKey);
if (result.startsWith("{\"error\":\"\"")) {
Log.d(TAG, "StartNode result: " + result);
Log.d(TAG, "saveAccountAndLoginWithKeycard result: " + result);
Log.d(TAG, "Geth node started");
} else {
Log.e(TAG, "StartNode failed: " + result);
Log.e(TAG, "saveAccountAndLoginWithKeycard failed: " + result);
}
}

4
scripts/release-android.sh
View File

@ -7,9 +7,7 @@ source "$_current_dir/lib/setup/path-support.sh"
source_lib "platform.sh"
nixOpts=(
"--arg env {BUILD_ENV=\"${BUILD_ENV}\";}"
"--arg env {ANDROID_ABI_SPLIT=\"${ANDROID_ABI_SPLIT}\";}"
"--arg env {ANDROID_ABI_INCLUDE=\"${ANDROID_ABI_INCLUDE}\";}"
"--arg env {BUILD_ENV=\"${BUILD_ENV}\";ANDROID_ABI_SPLIT=\"${ANDROID_ABI_SPLIT}\";ANDROID_ABI_INCLUDE=\"${ANDROID_ABI_INCLUDE}\";}"
"--argstr build-type ${BUILD_TYPE}"
"--argstr build-number ${BUILD_NUMBER}"
"--argstr keystore-file ${STORE_FILE}"