Skip to content

Commit e738fa3

Browse files
committed
updated sdk repo locations
1 parent 52d5ed6 commit e738fa3

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

src/processing/mode/android/SDKDownloader.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,15 @@
5050

5151
@SuppressWarnings("serial")
5252
public class SDKDownloader extends JDialog implements PropertyChangeListener {
53-
private static final String REPOSITORY_URL = "http://dl-ssl.google.com/android/repository/";
54-
private static final String REPOSITORY_LIST = "repository-11.xml";
53+
// Version 25.3.1 of the SDK tools break the mode, since the android tool
54+
// no longer works:
55+
// https://code.google.com/p/android/issues/detail?id=235455
56+
// as well as removing the ant scripts.
57+
// https://code.google.com/p/android/issues/detail?id=235410
58+
// See release notes:
59+
// https://developer.android.com/studio/releases/sdk-tools.html
60+
private static final String REPOSITORY_URL = "https://dl.google.com/android/repository/";
61+
private static final String REPOSITORY_LIST = "repository-12.xml";
5562
private static final String ADDON_LIST = "addon.xml";
5663

5764
// The Android Support Repository does not seem to include the

src/processing/mode/android/SysImageDownloader.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050

5151
@SuppressWarnings("serial")
5252
public class SysImageDownloader extends JDialog implements PropertyChangeListener {
53-
private static final String SYS_IMAGES_URL = "https://dl-ssl.google.com/android/repository/sys-img/android/";
53+
private static final String SYS_IMAGES_URL = "https://dl.google.com/android/repository/sys-img/google_apis/";
5454
private static final String SYS_IMAGES_LIST = "sys-img.xml";
5555

56-
private static final String SYS_IMAGES_WEAR_URL = "https://dl-ssl.google.com/android/repository/sys-img/android-wear/";
56+
private static final String SYS_IMAGES_WEAR_URL = "https://dl.google.com/android/repository/sys-img/android-wear/";
5757
private static final String SYS_IMAGES_WEAR_LIST = "sys-img.xml";
5858

5959
public static final String SYSTEM_IMAGE_TAG = "google_apis";
@@ -115,8 +115,8 @@ protected Object doInBackground() throws Exception {
115115
if (!tempFolder.exists()) tempFolder.mkdir();
116116

117117
try {
118-
String repo = wear ? SYS_IMAGES_URL + SYS_IMAGES_WEAR_LIST :
119-
SYS_IMAGES_WEAR_URL + SYS_IMAGES_LIST;
118+
String repo = wear ? SYS_IMAGES_WEAR_URL + SYS_IMAGES_WEAR_LIST :
119+
SYS_IMAGES_URL + SYS_IMAGES_LIST;
120120

121121
UrlHolder downloadUrls = new UrlHolder();
122122
getDownloadUrls(downloadUrls, repo, Platform.getName());

0 commit comments

Comments
 (0)