Merge pull request #42 from ldavin/master

[FIXED JENKINS-25336] Fix naming of emulator images for new ABI naming format.
jenkinsci · Jan 21, 2015 · 3ddf4b3 · 3ddf4b3
2 parents edfbb3d + 60c9808
commit 3ddf4b3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/hudson/plugins/android_emulator/EmulatorConfig.java b/src/main/java/hudson/plugins/android_emulator/EmulatorConfig.java
@@ -150,7 +150,7 @@ private String getGeneratedAvdName() {
         String platform = osVersion.getTargetName().replaceAll("[^a-zA-Z0-9._-]", "_");
         String abi = "";
         if (targetAbi != null && osVersion.requiresAbi()) {
-            abi = "_" + targetAbi.replace(' ', '-').replace('_', '-');
+            abi = "_" + targetAbi.replaceAll("[^a-zA-Z0-9._-]", "-");
         }
         String suffix = "";
         if (avdNameSuffix != null) {