Skip to content

Commit

Permalink
fix(android): fix path to emulator (react-native-community#60 by @von…
Browse files Browse the repository at this point in the history
  • Loading branch information
vonovak authored May 9, 2020
1 parent e4fa01f commit 8621ec9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/commands/android_emulator_start.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ parameters:
type: string
default: "28.0.3"
logcat_grep:
description: ADB logs will be shown in the "Start Android Emulator" commands, but we filter it using grep to avoid noise. You can specify additional strigns to grep for. Make sure you escape special characters.
description: ADB logs will be shown in the "Start Android Emulator" commands, but we filter it using grep to avoid noise. You can specify additional strings to grep for. Make sure you escape special characters.
type: string
default: "com.reactnativecommunity"

Expand All @@ -29,7 +29,7 @@ steps:
yes | sdkmanager "build-tools;<<parameters.build_tools_version>>" >/dev/null
yes | sdkmanager --licenses >/dev/null
yes | sdkmanager --list
# to force ssh key generation for emulators
- run:
name: ADB Start Stop
Expand All @@ -46,8 +46,8 @@ steps:
- run:
name: Start Android Emulator (background)
command: |
/usr/local/share/android-sdk/emulator/emulator @<<parameters.device_name>> -version
/usr/local/share/android-sdk/emulator/emulator @<<parameters.device_name>> -skin 470x860 -cores 1 -gpu auto -accel on -memory 1024 -no-audio -no-snapshot -no-boot-anim -no-window -logcat *:W | grep -i 'ReactNative\|<<parameters.logcat_grep>>'
$ANDROID_HOME/emulator/emulator @<<parameters.device_name>> -version
$ANDROID_HOME/emulator/emulator @<<parameters.device_name>> -skin 470x860 -cores 1 -gpu auto -accel on -memory 1024 -no-audio -no-snapshot -no-boot-anim -no-window -logcat *:W | grep -i 'ReactNative\|<<parameters.logcat_grep>>'
background: true

- run:
Expand Down
2 changes: 1 addition & 1 deletion src/jobs/android_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ parameters:
type: string
default: "28.0.3"
logcat_grep:
description: ADB logs will be shown in the "Start Android Emulator" commands, but we filter it using grep to avoid noise. You can specify additional strigns to grep for. Make sure you escape special characters. Defaults to 'com.reactnativecommunity'.
description: ADB logs will be shown in the "Start Android Emulator" commands, but we filter it using grep to avoid noise. You can specify additional strings to grep for. Make sure you escape special characters. Defaults to 'com.reactnativecommunity'.
type: string
default: "com.reactnativecommunity"
# For the detox command
Expand Down

0 comments on commit 8621ec9

Please sign in to comment.