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

nix: rename adb target to android-env 

Makes more sense since it contains entire Android SDK and NDK.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2020-03-16 11:57:13 +01:00
parent eb5fe57e90
commit 2f412d95ee
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -326,7 +326,7 @@ react-native-ios: export _NIX_PURE ?= true
react-native-ios: ##@other Start react native packager for Android client
@scripts/start-react-native.sh
geth-connect: export TARGET := adb
geth-connect: export TARGET := android-env
geth-connect: ##@other Connect to Geth on the device
adb forward tcp:8545 tcp:8545 && \
build/bin/geth attach http://localhost:8545
@ -335,22 +335,22 @@ android-clean: ##@prepare Clean Gradle state
git clean -dxf -f ./android/app/build
[ -d android/.gradle ] && cd android && ./gradlew clean
android-ports: export TARGET := adb
android-ports: export TARGET := android-env
android-ports: ##@other Add proxies to Android Device/Simulator
adb reverse tcp:8081 tcp:8081 && \
adb reverse tcp:3449 tcp:3449 && \
adb reverse tcp:4567 tcp:4567 && \
adb forward tcp:5561 tcp:5561
android-devices: export TARGET := adb
android-devices: export TARGET := android-env
android-devices: ##@other Invoke adb devices
adb devices
android-logcat: export TARGET := adb
android-logcat: export TARGET := android-env
android-logcat: ##@other Read status-react logs from Android phone using adb
adb logcat | grep -e RNBootstrap -e ReactNativeJS -e ReactNative -e StatusModule -e StatusNativeLogs -e 'F DEBUG :' -e 'Go :' -e 'GoLog :' -e 'libc :'
android-install: export TARGET := adb
android-install: export TARGET := android-env
android-install: export BUILD_TYPE ?= release
android-install:
adb install result/app-$(BUILD_TYPE).apk

2
nix/mobile/android/default.nix
View File

@ -53,7 +53,7 @@ in {
})
(lib.catAttrs "shell" [ status-go mavenAndNpmDeps androidEnv ]);
adb = {
env = {
shell = mkShell {
buildInputs = [ androidEnv.drv ];
inherit (androidEnv.shell) shellHook;

2
nix/shells.nix
View File

@ -56,7 +56,7 @@ in with pkgs; rec {
watchman = watchman-sh;
fastlane = fastlane-sh;
keytool = keytool-sh;
adb = targets.mobile.android.adb.shell;
android-env = targets.mobile.android.env.shell;
# helpers for use with target argument
linux = targets.desktop.linux.shell;
macos = targets.desktop.macos.shell;