aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/libs/sdklib
diff options
context:
space:
mode:
authorRaphael Moll <raphael@google.com>2012-03-07 15:04:09 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-07 15:04:09 -0800
commitde9dcb97c90a961f0e1500f5aea4be7501c4bc66 (patch)
treea1d401d3f511db3220e4308f26d7a240b1b79118 /sdkmanager/libs/sdklib
parent63eaae28b16b2205e047d7c9ed03e8b493894103 (diff)
parente70a66290663264c8990283924cf262107f68e7b (diff)
downloadsdk-de9dcb97c90a961f0e1500f5aea4be7501c4bc66.zip
sdk-de9dcb97c90a961f0e1500f5aea4be7501c4bc66.tar.gz
sdk-de9dcb97c90a961f0e1500f5aea4be7501c4bc66.tar.bz2
Merge "SDK: generate repo using latest schemas."
Diffstat (limited to 'sdkmanager/libs/sdklib')
-rwxr-xr-xsdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-4.xsd (renamed from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-addon-4.xsd)11
-rwxr-xr-xsdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-6.xsd (renamed from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-repository-6.xsd)8
2 files changed, 16 insertions, 3 deletions
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-addon-4.xsd b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-4.xsd
index ef92bde..564aaeb 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-addon-4.xsd
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-4.xsd
@@ -41,9 +41,18 @@
- <addon> element now has an optional <layoutlib> that indicates the API
and revision of the layout library for this particular add-on, if any.
- - v3 is used by the SDK Updater in Tools R14:
+ - v3 is used by the SDK Manager in Tools r14:
- <extra> now has an <old-paths> element, a ;-separated list of old paths that
should be detected and migrated to the new <path> for that package.
+
+ - v4 is used by the SDK Manager in Tools r18:
+ - <extra> and <addon> are not in the Repository XSD v6 anymore.
+ - <extra> get a new field <name-display>, which is used by the SDK Manager to
+ customize the name of the extra in the list display. The single <vendor>
+ field becomes <vendor-id> and <vendor-display>, the id being used internally
+ and the display in the UI.
+ - <addon> does the same, where <name> is replaced by <name-id> and <name-display>
+ and <vendor> is replaced by <vendor-id> and <vendor-display>.
-->
<xsd:element name="sdk-addon" type="sdk:repositoryType" />
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-repository-6.xsd b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-6.xsd
index d4cc1cb..002a75b 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-repository-6.xsd
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-6.xsd
@@ -55,7 +55,7 @@
- <platform> element now has a mandatory <layoutlib> that indicates the API
and revision of that layout library for this particular platform.
- - v5 is used by the SDK Updater in Tools R14:
+ - v5 is used by the SDK Manager in Tools r14:
- <extra> now has an <old-paths> element, a ;-separated list of old paths that
should be detected and migrated to the new <path> for that package.
- <platform> has a new optional <abi-included> that describes the ABI of the
@@ -63,7 +63,11 @@
- New <system-image> package type, to store system images outside of <platform>s.
- New <source> package type.
- - v6 removed 'extra' packages. They are served only by the addon XML.
+ - v6 is used by the SDK Manager in Tools r18:
+ - <extra> packages are removed. They are served only by the addon XML.
+ - <platform>, <system-image>, <source>, <tool>, <platform-tool>, <doc>
+ and <sample> get a new optional field <beta-rc> which can be used to indicate
+ the package is a Beta Release Candidate and not a final release.
-->
<xsd:element name="sdk-repository" type="sdk:repositoryType" />