Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-18919] Support named AVDs while 'keep in workspace' is…
… enabled.
  • Loading branch information
orrc committed May 18, 2014
1 parent 6e9b3e8 commit 92d9c03
Showing 1 changed file with 3 additions and 1 deletion.
Expand Up @@ -216,7 +216,8 @@ public Environment setUp(AbstractBuild build, final Launcher launcher, BuildList

// Build emulator config, ensuring that variables expand to valid SDK values
EmulatorConfig emuConfig;
final String androidSdkHome = (envVars != null && descriptor.shouldKeepInWorkspace ? envVars.get("WORKSPACE") : null);
boolean shouldKeepInWorkspace = descriptor.shouldKeepInWorkspace && Util.fixEmptyAndTrim(avdName) == null;
final String androidSdkHome = (envVars != null && shouldKeepInWorkspace ? envVars.get("WORKSPACE") : null);
try {
emuConfig = EmulatorConfig.create(avdName, osVersion, screenDensity,
screenResolution, deviceLocale, sdCardSize, wipeData, showWindow, useSnapshots,
Expand Down Expand Up @@ -758,6 +759,7 @@ public static final class DescriptorImpl extends BuildWrapperDescriptor implemen

/** Whether the SDK should be automatically installed where it's not found. */
public boolean shouldInstallSdk = true;

/** Whether the emulators should be kept in the workspace. */
public boolean shouldKeepInWorkspace = false;

Expand Down

0 comments on commit 92d9c03

Please sign in to comment.