From babcca2e1b85ca4683cf56d3b852de212ea63997 Mon Sep 17 00:00:00 2001 From: Siddarth Kumar Date: Wed, 19 Jun 2024 18:35:00 +0530 Subject: [PATCH] fix tiny bugs with make run-android --- nix/mobile/android/build.nix | 2 +- scripts/run-android.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 scripts/run-android.sh diff --git a/nix/mobile/android/build.nix b/nix/mobile/android/build.nix index 79ed562632..b672012642 100644 --- a/nix/mobile/android/build.nix +++ b/nix/mobile/android/build.nix @@ -141,7 +141,7 @@ in stdenv.mkDerivation rec { || exit 1 popd > /dev/null ''; - doCheck = buildType != debug; + doCheck = buildType != "debug"; checkPhase = '' ls ${apksPath}/*.apk \ | xargs -n1 ${pkgs.unzip}/bin/unzip -qql \ diff --git a/scripts/run-android.sh b/scripts/run-android.sh old mode 100644 new mode 100755 index 2595b76008..ecfa33e335 --- a/scripts/run-android.sh +++ b/scripts/run-android.sh @@ -5,7 +5,7 @@ GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel) ADB_INSTALL_LOG_FILE="${GIT_ROOT}/logs/adb_install.log" ADB_SHELL_MONKEY_LOG_FILE="${GIT_ROOT}/logs/adb_shell_monkey.log" -Generate android debug build. +# Generate android debug build. export BUILD_ENV=debug export BUILD_TYPE=debug export BUILD_NUMBER=99999 @@ -13,7 +13,7 @@ export ANDROID_ABI_SPLIT=false export ANDROID_ABI_INCLUDE="armeabi-v7a;arm64-v8a;x86;x86_64" "${GIT_ROOT}/scripts/build-android.sh" -Install the APK on running emulator or android device. +# Install the APK on running emulator or android device. installAndLaunchApp() { adb install -r ./result/app-debug.apk > "${ADB_INSTALL_LOG_FILE}" 2>&1 "${GIT_ROOT}/scripts/wait-for-metro-port.sh" 2>&1