aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/libs/sdkuilib
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2011-10-04 15:33:15 -0700
committerRaphael <raphael@google.com>2011-10-04 15:33:15 -0700
commit46b86398f7287cbdc88a15f9f6a2418ba29a7dbc (patch)
tree1789772e0e2e215364f77bef51033f6970273f3b /sdkmanager/libs/sdkuilib
parent8f4710850b3a01d6e5f1188440c59d6999646858 (diff)
downloadsdk-46b86398f7287cbdc88a15f9f6a2418ba29a7dbc.zip
sdk-46b86398f7287cbdc88a15f9f6a2418ba29a7dbc.tar.gz
sdk-46b86398f7287cbdc88a15f9f6a2418ba29a7dbc.tar.bz2
SDK: use repository-N.xml by default.
(This is part of Change I566b6945 but I had forgotten to amend & upload, grrr.) Change-Id: Ic494179481346a2eda0f56327ddac0f123bf4538
Diffstat (limited to 'sdkmanager/libs/sdkuilib')
-rwxr-xr-xsdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
index d59e67b..cb26576 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
@@ -337,10 +337,12 @@ public class UpdaterData implements IUpdaterData {
for (String url : urls) {
if (url != null) {
url = url.trim();
- if (url.endsWith("/") || url.endsWith(SdkRepoConstants.URL_DEFAULT_FILENAME)) {
+ if (url.endsWith("/")
+ || url.endsWith(SdkRepoConstants.URL_DEFAULT_FILENAME)
+ || url.endsWith(SdkRepoConstants.URL_DEFAULT_FILENAME2)) {
String fullUrl = url;
if (fullUrl.endsWith("/")) {
- fullUrl += SdkRepoConstants.URL_DEFAULT_FILENAME;
+ fullUrl += SdkRepoConstants.URL_DEFAULT_FILENAME2;
}
SdkSource s = new SdkRepoSource(fullUrl, null/*uiName*/);