OSDN Git Service

SDK: use repository-N.xml by default.
authorRaphael <raphael@google.com>
Tue, 4 Oct 2011 22:33:15 +0000 (15:33 -0700)
committerRaphael <raphael@google.com>
Tue, 4 Oct 2011 22:33:15 +0000 (15:33 -0700)
(This is part of Change I566b6945 but I had forgotten
to amend & upload, grrr.)

Change-Id: Ic494179481346a2eda0f56327ddac0f123bf4538

sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java

index d59e67b..cb26576 100755 (executable)
@@ -337,10 +337,12 @@ public class UpdaterData implements IUpdaterData {
             for (String url : urls) {\r
                 if (url != null) {\r
                     url = url.trim();\r
-                    if (url.endsWith("/") || url.endsWith(SdkRepoConstants.URL_DEFAULT_FILENAME)) {\r
+                    if (url.endsWith("/")\r
+                            || url.endsWith(SdkRepoConstants.URL_DEFAULT_FILENAME)\r
+                            || url.endsWith(SdkRepoConstants.URL_DEFAULT_FILENAME2)) {\r
                         String fullUrl = url;\r
                         if (fullUrl.endsWith("/")) {\r
-                            fullUrl += SdkRepoConstants.URL_DEFAULT_FILENAME;\r
+                            fullUrl += SdkRepoConstants.URL_DEFAULT_FILENAME2;\r
                         }\r
 \r
                         SdkSource s = new SdkRepoSource(fullUrl, null/*uiName*/);\r