Fix minor issues and typos in Android build process

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>

.gitignore

@@ -163,6 +163,7 @@ conan.cmake
 # nix
 /.ran-setup
 /.nix-gcroots/
+/result
 
 # modules
 status-modules/translations

Makefile

@@ -286,7 +286,7 @@ android-install: export _NIX_ATTR := targets.mobile.android.adb.shell
 android-install: export TARGET_OS ?= android
 android-install: export BUILD_TYPE ?= release
 android-install:
-	adb install android/app/build/outputs/apk/$(BUILD_TYPE)/app-$(BUILD_TYPE).apk
+	adb install result/app.apk
 
 _list: SHELL := /bin/sh
 _list:

android/app/build.gradle

@@ -234,8 +234,9 @@ android {
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
-            // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
+
-            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3, "x86-64": 4]
+            // https://developer.android.com/studio/build/configure-apk-splits.html
+            def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =

android/build.gradle

@@ -50,9 +50,9 @@ allprojects {
 
     repositories {
         mavenLocal()
+        maven { url "$rootDir/../node_modules/react-native/android" }
         google()
         jcenter()
-        maven { url "$rootDir/../node_modules/react-native/android" }
         // for geth, function, and status-go
         flatDir { dirs "libs", System.env.STATUS_GO_ANDROID_LIBDIR }
         maven { url "https://jitpack.io" }

nix/mobile/android/android-env.nix

@@ -18,7 +18,6 @@ let
     includeDocs = false;
     includeSystemImages = false;
     systemImageTypes = [ "default" ];
-    abiVersions = [ "armeabi-v7a" ];
     lldbVersions = [ "2.0.2558144" ];
     cmakeVersions = [ "3.6.4111459" ];
     includeNDK = true;
@@ -37,13 +36,14 @@ let
       for d in ${androidComposition.androidsdk}/libexec/android-sdk/*; do
         ln -s $d $out/$(basename $d)
       done
-    '' + stdenv.lib.optionalString config.android_sdk.accept_license ''
+      ${stdenv.lib.optionalString config.android_sdk.accept_license ''
       mkdir -p $out/licenses
       echo -e "\n601085b94cd77f0b54ff86406957099ebe79c4d6" > "$out/licenses/android-googletv-license"
       echo -e "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$out/licenses/android-sdk-license"
       echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$out/licenses/android-sdk-preview-license"
       echo -e "\nd975f751698a77b662f1254ddbeed3901e976f5a" > "$out/licenses/intel-android-extra-license"
       echo -e "\n33b6a2b64607f11b759f320ef9dff4ae5c47d97a" > "$out/licenses/google-gdk-license"
+      ''}
     '';
   };
   shellHook = assert platform.targetAndroid;

nix/mobile/android/maven-and-npm-deps/default.nix

@@ -51,7 +51,7 @@ let
               };
           };
         nativeBuildInputs = [ projectNodePackage ];
-        buildInputs = [ gradle bash file zlib mavenLocalRepo ];
+        buildInputs = [ gradle nodejs bash file zlib mavenLocalRepo ];
         propagatedBuildInputs = [ react-native-deps ] ++ status-go.buildInputs;
         unpackPhase = ''
           runHook preUnpack

nix/mobile/android/maven-and-npm-deps/maven/reactnative-android-native-deps.nix

@@ -23,7 +23,8 @@ let
     }
     rec {
       name = "glog";
-      url = "https://github.com/google/${name}/archive/v0.3.5.tar.gz";
+      version = "0.3.5";
+      url = "https://github.com/google/${name}/archive/v${version}.tar.gz";
       sha256 = "1q6ihk2asbx95a56kmyqwysq1x3grrw9jwqllafaidf0l84f903m";
     }
   ];

nix/status-go/default.nix

@@ -19,6 +19,8 @@ let
   shortRev = strings.substring 0 7 rev;
   goPackagePath = "github.com/${owner}/${repo}";
   src = fetchFromGitHub { inherit rev owner repo sha256; name = "${repo}-${shortRev}-source"; };
+  # Replace src value with the path to a local status-go repository if you want to perform a build against it, e.g.
+  #src = /home/<user>/go/src/github.com/status-im/status-go;
 
   mobileConfigs = {
     android = {

translations/en.json

@@ -1032,7 +1032,7 @@
     "migrations-failed-title": "Migration failed",
     "migrations-failed-content": "{{message}}\nschema version: initial {{initial-version}}, current {{current-version}}, last {{last-version}}\n\nPlease let us know about this problem at #status public chat. If you press \"Cancel\" button, nothing will happen. If you press \"{{erase-multiaccounts-data-button-text}}\" button, multiaccount's db will be removed and you will be able to unlock multiaccount. All multiaccount's data will be lost.",
     "migrations-erase-multiaccounts-data-button": "Erase multiaccount's db",
-    "multiaccount-and-db-password-mismatch-title": "The problem occurred!",
+    "multiaccount-and-db-password-mismatch-title": "A problem occurred!",
     "multiaccount-and-db-password-mismatch-content": "Multiaccount's and realm db passwords do not match.",
     "recover-multiaccount-warning": "Your wallet information will be exposed by importing this multiaccount.",
     "buy-with-snt": "Buy with SNT",