Skip to content

Add support for ANDROID_SDK_ROOT #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
friederbluemle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for ANDROID_SDK_ROOT #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/android/adb.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ export function runAndroidLoggingProcess(adbPath?: string): ChildProcess {
return spawnLogcatProcess(execPath);
}

export function getSdkRoot(): string | undefined {
return process.env.ANDROID_SDK_ROOT ?? process.env.ANDROID_HOME;
}

export function getAdbPath(customPath?: string): string {
if (customPath) {
return path.resolve(customPath);
}

return process.env.ANDROID_HOME
? `${process.env.ANDROID_HOME}/platform-tools/adb`
: 'adb';
const sdkRoot = getSdkRoot();
return sdkRoot ? `${sdkRoot}/platform-tools/adb` : 'adb';
}

export function spawnLogcatProcess(adbPath: string): ChildProcess {
Expand Down