Skip to content
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

Jump to bottom

fix: Android preferences root path on Windows #558

Merged
merged 15 commits into from
Nov 26, 2020
Merged

fix: Android preferences root path on Windows #558

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
43c1342
Fix Android preferences root path on Windows
jpkleemans Nov 24, 2020
ccd54e0
Check ANDROID_EMULATOR_HOME & ANDROID_SDK_HOME
jpkleemans Nov 24, 2020
7c2dc3f
Check ANDROID_AVD_HOME
jpkleemans Nov 24, 2020
a5a9deb
Log when directories don't exist
jpkleemans Nov 24, 2020
0aebd40
Check if ANDROID_EMULATOR_HOME exists
jpkleemans Nov 24, 2020
e8b9ce6
Remove check for ANDROID_SDK_HOME
jpkleemans Nov 24, 2020
cfb857b
Log when paths don't exist
jpkleemans Nov 24, 2020
fb7a619
Remove dead link comment
jpkleemans Nov 24, 2020
aa694f6
Proceed when env directories aren't found
jpkleemans Nov 24, 2020
f9d8102
Fix async/await keywords
jpkleemans Nov 25, 2020
4973a76
Update warnings
jpkleemans Nov 25, 2020
c6bbcba
Simplify dirExists
jpkleemans Nov 25, 2020
19322aa
Add docstring
jpkleemans Nov 25, 2020
ef527f1
Fix PR comments
jpkleemans Nov 26, 2020
60f04b7
Fix casing
jpkleemans Nov 26, 2020
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
39 changes: 17 additions & 22 deletions lib/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,35 +848,30 @@ function toAvdLocaleArgs (language, country) {
* @returns {?string} The full path to the folder or `null` if the folder cannot be found
*/
async function getAndroidPrefsRoot () {
// https://gerrit.pixelexperience.org/plugins/gitiles/development/+/5c11852110eeb03dc5a69111354b383f98d15336/tools/androidprefs/src/com/android/prefs/AndroidLocation.java
let location = null;
if (system.isWindows()) {
let localAppData = process.env.LOCALAPPDATA;
if (!localAppData) {
localAppData = process.env.USERPROFILE;
if (localAppData) {
localAppData = path.resolve(localAppData, 'Local Settings', 'Application Data');
}
}
if (localAppData) {
location = path.resolve(localAppData, 'Android');
}
} else {
const home = process.env.HOME;
let location = process.env.ANDROID_EMULATOR_HOME;
jpkleemans marked this conversation as resolved.
Show resolved Hide resolved
if (location && !await fs.exists(location)) {
jpkleemans marked this conversation as resolved.
Show resolved Hide resolved
log.debug(`Value of $ANDROID_EMULATOR_HOME '${location}' does not exist`);
return null;
jpkleemans marked this conversation as resolved.
Show resolved Hide resolved
}

if (!location) {
jpkleemans marked this conversation as resolved.
Show resolved Hide resolved
const home = process.env.HOME || process.env.USERPROFILE;
if (home) {
location = path.resolve(home, '.android');
}
}

if (location && await fs.exists(location)) {
if (!(await fs.stat(location)).isDirectory()) {
log.debug(`Android config root '${location}' is not a directory`);
return null;
}
return location;
if (!location || !await fs.exists(location)) {
log.debug(`Android config root '${location}' does not exist`);
return null;
}

if (!(await fs.stat(location)).isDirectory()) {
log.debug(`Android config root '${location}' is not a directory`);
return null;
}

return null;
return location;
}

export {
Expand Down
18 changes: 14 additions & 4 deletions lib/tools/adb-emu-commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,24 @@ emuMethods.SENSORS = {
* @returns {Array<EmuInfo>}
*/
async function listEmulators () {
// https://android.googlesource.com/platform/sdk/+/33f330d963c1bf24667eddb891531abcce9fb4de/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
const prefsRoot = await getAndroidPrefsRoot();
if (!prefsRoot) {
let avdsRoot = process.env.ANDROID_AVD_HOME;
if (avdsRoot && !await fs.exists(avdsRoot)) {
log.debug(`Value of $ANDROID_AVD_HOME '${location}' does not exist`);
return [];
jpkleemans marked this conversation as resolved.
Show resolved Hide resolved
}

const avdsRoot = path.resolve(prefsRoot, 'avd');
if (!avdsRoot) {
// https://android.googlesource.com/platform/sdk/+/33f330d963c1bf24667eddb891531abcce9fb4de/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
const prefsRoot = await getAndroidPrefsRoot();
if (!prefsRoot) {
return [];
}

avdsRoot = path.resolve(prefsRoot, 'avd');
}

if (!await fs.exists(avdsRoot)) {
log.debug(`Virtual devices config root '${avdsRoot}' does not exist`);
return [];
}

Expand Down