jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/366253 )
Change subject: Update system image component name construction for APIs >= 25
......................................................................
Update system image component name construction for APIs >= 25
The naming convention for Android system images changes slightly beginning
at level 25; this updates the component name constructor logic so that the
desired image is found.
N.B. Based on the images available via the Device Manager GUI and on
searching around the web, it looks like only system images with Google API
support are available for these API levels.
Bug: T150623
Change-Id: I9c42dfc0d8ee662440fcdd1668007d0931a7b2b3
---
M src/main/java/hudson/plugins/android_emulator/SdkInstaller.java
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/main/java/hudson/plugins/android_emulator/SdkInstaller.java
b/src/main/java/hudson/plugins/android_emulator/SdkInstaller.java
index e0e422f..18ca69b 100644
--- a/src/main/java/hudson/plugins/android_emulator/SdkInstaller.java
+++ b/src/main/java/hudson/plugins/android_emulator/SdkInstaller.java
@@ -343,7 +343,9 @@
// Even if a system image doesn't exist for this platform, the
installer silently ignores it
if (dependentPlatform >= 10 && abi != null) {
if (sdk.supportsSystemImageNewFormat()) {
- String tag = "android";
+ // Adjust for API levels >= 25, where only images with Google
API support are
+ // available, and the naming convention changes slightly
+ String tag = dependentPlatform >= 25 ? "google_apis" :
"android";
int slash = abi.indexOf('/');
if (slash > 0 && slash < abi.length() - 1) {
tag = abi.substring(0, slash);
--
To view, visit https://gerrit.wikimedia.org/r/366253
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c42dfc0d8ee662440fcdd1668007d0931a7b2b3
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkinsci/android-emulator-plugin
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
