SDK Manager: support standalone sys-img xml.

This extends the addons_list XSD to support both
addons sites and OEM's system-image sites.

Then this defines a new schema "sys-img" XSD for
a site that offers only system images.

Change-Id: I77ff56c4c70f57ab8ea44cf4ea3094125653737b

2 files changed, 12 insertions, 5 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AddonSitesDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AddonSitesDialog.java
index 10b02c6..d1078d0 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AddonSitesDialog.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AddonSitesDialog.java
@@ -382,9 +382,7 @@ public class AddonSitesDialog extends UpdaterBaseDialog {
 
                 // create the source, store it and update the list
                 SdkAddonSource newSource = new SdkAddonSource(url, null/*uiName*/);
-                mSources.add(
-                        SdkSourceCategory.USER_ADDONS,
-                        newSource);
+                mSources.add(SdkSourceCategory.USER_ADDONS, newSource);
                 setReturnValue(true);
                 // notify sources change listeners. This will invoke our own loadUserUrlsList().
                 mSources.notifyChangeListeners();
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackageLoader.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackageLoader.java
index 4ad78b8..983c94d 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackageLoader.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackageLoader.java
@@ -29,6 +29,7 @@ import com.android.sdklib.internal.repository.sources.SdkAddonSource;
 import com.android.sdklib.internal.repository.sources.SdkSource;
 import com.android.sdklib.internal.repository.sources.SdkSourceCategory;
 import com.android.sdklib.internal.repository.sources.SdkSources;
+import com.android.sdklib.internal.repository.sources.SdkSysImgSource;
 import com.android.sdklib.repository.SdkAddonsListConstants;
 import com.android.sdklib.repository.SdkRepoConstants;
 import com.android.sdkuilib.internal.repository.UpdaterData;
@@ -448,8 +449,16 @@ public class PackageLoader {
 
             if (fetch3rdParties) {
                 for (Site s : sites) {
-                    sources.add(SdkSourceCategory.ADDONS_3RD_PARTY,
-                                 new SdkAddonSource(s.getUrl(), s.getUiName()));
+                    switch (s.getType()) {
+                    case ADDON_SITE:
+                        sources.add(SdkSourceCategory.ADDONS_3RD_PARTY,
+                                new SdkAddonSource(s.getUrl(), s.getUiName()));
+                        break;
+                    case SYS_IMG_SITE:
+                        sources.add(SdkSourceCategory.ADDONS_3RD_PARTY,
+                                new SdkSysImgSource(s.getUrl(), s.getUiName()));
+                        break;
+                    }
                 }
             }