Skip to content

Commit 054f1fd

Browse files
committed
Use macosx as host url when parsing SDK archives
1 parent ddabf0e commit 054f1fd

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

mode/src/processing/mode/android/SDKDownloader.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,15 @@ protected Object doInBackground() throws Exception {
128128
String repositoryUrl = REPOSITORY_URL + REPOSITORY_LIST;
129129
String addonUrl = REPOSITORY_URL + ADDON_LIST;
130130
String haxmUrl = HAXM_URL + ADDON_LIST;
131-
getMainDownloadUrls(downloadUrls, repositoryUrl, Platform.getName());
132-
getExtrasDownloadUrls(downloadUrls, addonUrl, Platform.getName());
133-
getHaxmDownloadUrl(downloadUrls, haxmUrl, Platform.getName());
131+
132+
String platformName = Platform.getName();
133+
System.out.println("PLATFORM NAME " + platformName);
134+
if (platformName.equals("macos")) {
135+
platformName = "macosx";
136+
}
137+
getMainDownloadUrls(downloadUrls, repositoryUrl, platformName);
138+
getExtrasDownloadUrls(downloadUrls, addonUrl, platformName);
139+
getHaxmDownloadUrl(downloadUrls, haxmUrl, platformName);
134140
firePropertyChange(AndroidMode.getTextString("download_property.change_event_total"), 0, downloadUrls.totalSize);
135141

136142
// Command-line tools
@@ -246,7 +252,7 @@ private void downloadAndUnpack(String urlString, File saveTo,
246252
}
247253

248254
private void getMainDownloadUrls(SDKUrlHolder urlHolder,
249-
String repositoryUrl, String requiredHostOs)
255+
String repositoryUrl, String requiredHostOs)
250256
throws ParserConfigurationException, IOException, SAXException, XPathException {
251257
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
252258
DocumentBuilder db = dbf.newDocumentBuilder();
@@ -429,7 +435,7 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
429435
}
430436

431437
private void getExtrasDownloadUrls(SDKUrlHolder urlHolder,
432-
String repositoryUrl, String requiredHostOs)
438+
String repositoryUrl, String requiredHostOs)
433439
throws ParserConfigurationException, IOException, SAXException, XPathException {
434440
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
435441
DocumentBuilder db = dbf.newDocumentBuilder();

0 commit comments

Comments
 (0)