From a327cc8faf81577a0a6342af1d8a990cd7851a20 Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 4 Oct 2011 15:33:15 -0700 Subject: SDK: use repository-N.xml by default. Do not merge. (This is part of Change I566b6945 but I had forgotten to amend & upload, grrr.) (cherry picked from commit 46b86398f7287cbdc88a15f9f6a2418ba29a7dbc) Change-Id: I71ad810ac2ddbd11ece7f8e5afea22740a52100f --- .../src/com/android/sdkuilib/internal/repository/UpdaterData.java | 6 ++++-- 1 file 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 ac292c3..2dd3b4e 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 @@ -344,10 +344,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*/); -- cgit v1.1