am f838117e: Merge "Switch to latest SDK repo/addon/sysimg XSD."
* commit 'f838117e065f24f3f81b284a33cfd62c86b00739':
Switch to latest SDK repo/addon/sysimg XSD.
diff --git a/repository/sdk-addon-1.xsd b/repository/sdk-addon-01.xsd
similarity index 100%
rename from repository/sdk-addon-1.xsd
rename to repository/sdk-addon-01.xsd
diff --git a/repository/sdk-addon-2.xsd b/repository/sdk-addon-02.xsd
similarity index 100%
rename from repository/sdk-addon-2.xsd
rename to repository/sdk-addon-02.xsd
diff --git a/repository/sdk-addon-3.xsd b/repository/sdk-addon-03.xsd
similarity index 100%
rename from repository/sdk-addon-3.xsd
rename to repository/sdk-addon-03.xsd
diff --git a/repository/sdk-addon-4.xsd b/repository/sdk-addon-04.xsd
similarity index 100%
rename from repository/sdk-addon-4.xsd
rename to repository/sdk-addon-04.xsd
diff --git a/repository/sdk-addon-5.xsd b/repository/sdk-addon-05.xsd
similarity index 100%
rename from repository/sdk-addon-5.xsd
rename to repository/sdk-addon-05.xsd
diff --git a/repository/sdk-addon-6.xsd b/repository/sdk-addon-06.xsd
similarity index 100%
rename from repository/sdk-addon-6.xsd
rename to repository/sdk-addon-06.xsd
diff --git a/repository/sdk-addon-07.xsd b/repository/sdk-addon-07.xsd
new file mode 100755
index 0000000..3c2c13a
--- /dev/null
+++ b/repository/sdk-addon-07.xsd
@@ -0,0 +1,499 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<xsd:schema
+ targetNamespace="http://schemas.android.com/sdk/android/addon/7"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:sdk="http://schemas.android.com/sdk/android/addon/7"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1">
+
+ <!-- The repository contains a collection of downloadable items known as
+ "packages". Each package has a type and various attributes and contains
+ a list of file "archives" that can be downloaded for specific OSes.
+
+ An Android Addon repository is a web site that contains an "addon.xml"
+ file that conforms to this XML Schema.
+
+ History:
+ - v1 is used by the SDK Updater in Tools r8. It is split out of the
+ main SDK Repository XML Schema and can only contain <addon> and
+ <extra> packages.
+
+ - v2 is used by the SDK Updater in Tools r12.
+ - <extra> element now has a <project-files> element that contains 1 or
+ or more <path>, each indicating the relative path of a file that this package
+ can contribute to installed projects.
+ - <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 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>.
+
+ - v5 is used by the SDK Manager in Tools r20:
+ - The <beta-rc> element is no longer supported. It was never implemented anyway.
+ - For <tool> and <platform-tool> packages, the <revision> element becomes a
+ a "full revision" element with <major>, <minor>, <micro> and <preview> sub-elements.
+ - <min-tools-rev> for <extra> becomes a full revision element.
+
+ - v6 is used by the SDK Manager in Tools r22.3:
+ - <extra> revision is now a "full revision" element with <major>, <minor>, <micro>.
+ It does not support the <revision><preview> sub-element though.
+
+ - v7 is used by the SDK Manager in Tools r22.6.4:
+ - It introduces a <list-display> string for all package types.
+ - it changes <archive os=... arch=...> to sub-elements: <host-os>, <host-bits>,
+ <jvm-bits> and <min-jvm-version>.
+ -->
+
+ <xsd:element name="sdk-addon" type="sdk:repositoryType" />
+
+ <xsd:complexType name="repositoryType">
+ <xsd:annotation>
+ <xsd:documentation>
+ The repository contains a collection of downloadable packages.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="add-on" type="sdk:addonType" />
+ <xsd:element name="extra" type="sdk:extraType" />
+ <xsd:element name="license" type="sdk:licenseType" />
+ </xsd:choice>
+ </xsd:complexType>
+
+
+ <!-- The definition of an SDK Add-on package. -->
+
+ <xsd:complexType name="addonType">
+ <xsd:annotation>
+ <xsd:documentation>An SDK add-on package.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:all>
+ <!-- The internal name id of the add-on. Must be unique per vendor. -->
+ <xsd:element name="name-id" type="sdk:idType" />
+ <!-- The displayed name of the add-on. -->
+ <xsd:element name="name-display" type="xsd:normalizedString" />
+
+ <!-- The internal vendor id of the add-on. Must be unique amongst vendors. -->
+ <xsd:element name="vendor-id" type="sdk:idType" />
+ <!-- The displayed vendor name of the add-on. -->
+ <xsd:element name="vendor-display" type="xsd:normalizedString" />
+
+ <!-- The Android API Level for the add-on. An int > 0. -->
+ <xsd:element name="api-level" type="xsd:positiveInteger" />
+ <!-- Note: Add-ons do not support 'codenames' (a.k.a. API previews). -->
+ <!-- The revision, an int > 0, incremented each time a new
+ package is generated. -->
+ <xsd:element name="revision" type="xsd:positiveInteger" />
+
+ <!-- The optional display list item. When missing, it is auto-computed. -->
+ <xsd:element name="list-display" type="xsd:normalizedString" minOccurs="0" />
+
+ <!-- An add-on can declare 0 or more libraries.
+ This element is mandatory but it can be empty.
+ -->
+
+ <xsd:element name="libs">
+ <xsd:complexType>
+ <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="lib">
+ <xsd:complexType>
+ <xsd:all>
+ <!-- The name of the library. -->
+ <xsd:element name="name" type="xsd:normalizedString" />
+ <!-- The optional description of this add-on library. -->
+ <xsd:element name="description" type="xsd:string" minOccurs="0" />
+ </xsd:all>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <!-- optional elements -->
+
+ <!-- The optional license of this package. If present, users will have
+ to agree to it before downloading. -->
+ <xsd:element name="uses-license" type="sdk:usesLicenseType" minOccurs="0" />
+ <!-- The optional description of this package. -->
+ <xsd:element name="description" type="xsd:string" minOccurs="0" />
+ <!-- The optional description URL of this package -->
+ <xsd:element name="desc-url" type="xsd:token" minOccurs="0" />
+ <!-- The optional release note for this package. -->
+ <xsd:element name="release-note" type="xsd:string" minOccurs="0" />
+ <!-- The optional release note URL of this package -->
+ <xsd:element name="release-url" type="xsd:token" minOccurs="0" />
+ <!-- A list of file archives for this package. -->
+ <xsd:element name="archives" type="sdk:archivesType" />
+
+ <!-- An optional element indicating the package is obsolete.
+ The string content is however currently not defined and ignored. -->
+ <xsd:element name="obsolete" type="xsd:string" minOccurs="0" />
+
+ <!-- Optional information on the layoutlib packaged in this platform. -->
+ <xsd:element name="layoutlib" type="sdk:layoutlibType" minOccurs="0" />
+ </xsd:all>
+ </xsd:complexType>
+
+
+ <xsd:simpleType name="idType">
+ <xsd:annotation>
+ <xsd:documentation>
+ An ID string for an addon/extra name-id or vendor-id
+ can only be simple alphanumeric string.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:pattern value="[a-zA-Z0-9_-]+"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+
+ <!-- The definition of a layout library used by an addon. -->
+
+ <xsd:complexType name="layoutlibType" >
+ <xsd:annotation>
+ <xsd:documentation>
+ Version information for a layoutlib included in an addon.
+ .</xsd:documentation>
+ </xsd:annotation>
+ <xsd:all>
+ <!-- The layoutlib API level, an int > 0,
+ incremented with each new incompatible lib. -->
+ <xsd:element name="api" type="xsd:positiveInteger" />
+ <!-- The incremental minor revision for that API, e.g. in case of bug fixes.
+ Optional. An int >= 0, assumed to be 0 if the element is missing. -->
+ <xsd:element name="revision" type="xsd:nonNegativeInteger" minOccurs="0" />
+ </xsd:all>
+ </xsd:complexType>
+
+
+ <!-- The definition of an SDK extra package. This kind of package is for
+ "free" content. Such packages are installed in SDK/extras/vendor/path.
+ -->
+
+ <xsd:complexType name="extraType" >
+ <xsd:annotation>
+ <xsd:documentation>
+ An SDK extra package. This kind of package is for "free" content.
+ Such packages are installed in SDK/vendor/path.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:all>
+ <!-- The displayed name of the extra. -->
+ <xsd:element name="name-display" type="xsd:normalizedString" />
+
+ <!-- The optional display list item. When missing, it is auto-computed. -->
+ <xsd:element name="list-display" type="xsd:normalizedString" minOccurs="0" />
+
+ <!-- The internal vendor id of the extra. Must be unique amongst vendors. -->
+ <xsd:element name="vendor-id" type="sdk:idType" />
+ <!-- The displayed vendor name of the extra. -->
+ <xsd:element name="vendor-display" type="xsd:normalizedString" />
+
+ <!-- The install path sub-folder name. It must not be empty. -->
+ <xsd:element name="path" type="sdk:segmentType" />
+
+ <!-- A semi-colon separated list of "obsolete" path names which are equivalent
+ to the current 'path' name. When a package is seen using an old-paths' name,
+ the package manager will try to upgrade it to the new path. -->
+ <xsd:element name="old-paths" type="sdk:segmentListType" minOccurs="0" />
+
+ <!-- The revision, in major.minor.micro format, incremented each time a new
+ package is generated. -->
+ <xsd:element name="revision" type="sdk:revisionNoPreviewType" minOccurs="0" />
+
+ <!-- A list of file archives for this package. -->
+ <xsd:element name="archives" type="sdk:archivesType" />
+
+ <!-- optional elements -->
+
+ <!-- The optional license of this package. If present, users will have
+ to agree to it before downloading. -->
+ <xsd:element name="uses-license" type="sdk:usesLicenseType" minOccurs="0" />
+ <!-- The optional description of this package. -->
+ <xsd:element name="description" type="xsd:string" minOccurs="0" />
+ <!-- The optional description URL of this package -->
+ <xsd:element name="desc-url" type="xsd:token" minOccurs="0" />
+ <!-- The optional release note for this package. -->
+ <xsd:element name="release-note" type="xsd:string" minOccurs="0" />
+ <!-- The optional release note URL of this package -->
+ <xsd:element name="release-url" type="xsd:token" minOccurs="0" />
+ <!-- The minimal revision of tools required by this package.
+ Optional. If present, must be a revision element. -->
+ <xsd:element name="min-tools-rev" type="sdk:revisionType" minOccurs="0" />
+ <!-- The minimal API level required by this package.
+ Optional. If present, must be an int > 0. -->
+ <xsd:element name="min-api-level" type="xsd:positiveInteger" minOccurs="0" />
+
+ <!-- An optional element indicating the package is obsolete.
+ The string content is however currently not defined and ignored. -->
+ <xsd:element name="obsolete" type="xsd:string" minOccurs="0" />
+
+ <!-- A list of project files contributed by this package. Optional. -->
+ <xsd:element name="project-files" type="sdk:projectFilesType" minOccurs="0" />
+ </xsd:all>
+ </xsd:complexType>
+
+
+ <!-- A full revision, with a major.minor.micro and an optional preview number.
+ The major number is mandatory, the other elements are optional.
+ -->
+
+ <xsd:complexType name="revisionType">
+ <xsd:annotation>
+ <xsd:documentation>
+ A full revision, with a major.minor.micro and an
+ optional preview number. The major number is mandatory.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:all>
+ <!-- The major revision, an int > 0, incremented each time a new
+ package is generated. -->
+ <xsd:element name="major" type="xsd:positiveInteger" />
+ <!-- The minor revision, an int >= 0, incremented each time a new
+ minor package is generated. Assumed to be 0 if missing. -->
+ <xsd:element name="minor" type="xsd:nonNegativeInteger" minOccurs="0" />
+ <!-- The micro revision, an int >= 0, incremented each time a new
+ buf fix is generated. Assumed to be 0 if missing. -->
+ <xsd:element name="micro" type="xsd:nonNegativeInteger" minOccurs="0" />
+ <!-- The preview/release candidate revision, an int > 0,
+ incremented each time a new preview is generated.
+ Not present for final releases. -->
+ <xsd:element name="preview" type="xsd:positiveInteger" minOccurs="0" />
+ </xsd:all>
+ </xsd:complexType>
+
+
+ <!-- A full revision, with a major.minor.micro but that does not support the
+ optional preview number.
+ The major number is mandatory, the other elements are optional.
+ -->
+
+ <xsd:complexType name="revisionNoPreviewType">
+ <xsd:annotation>
+ <xsd:documentation>
+ A full revision, with a major.minor.micro and no support for
+ the optional preview number. The major number is mandatory.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:all>
+ <!-- The major revision, an int > 0, incremented each time a new
+ package is generated. -->
+ <xsd:element name="major" type="xsd:positiveInteger" />
+ <!-- The minor revision, an int >= 0, incremented each time a new
+ minor package is generated. Assumed to be 0 if missing. -->
+ <xsd:element name="minor" type="xsd:nonNegativeInteger" minOccurs="0" />
+ <!-- The micro revision, an int >= 0, incremented each time a new
+ buf fix is generated. Assumed to be 0 if missing. -->
+ <xsd:element name="micro" type="xsd:nonNegativeInteger" minOccurs="0" />
+ </xsd:all>
+ </xsd:complexType>
+
+
+ <!-- The definition of a path segment used by the extra element. -->
+
+ <xsd:simpleType name="segmentType">
+ <xsd:annotation>
+ <xsd:documentation>
+ One path segment for the install path of an extra element.
+ It must be a single-segment path. It must not be empty.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:pattern value="[a-zA-Z0-9_]+"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="segmentListType">
+ <xsd:annotation>
+ <xsd:documentation>
+ A semi-colon separated list of a segmentTypes.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:pattern value="[a-zA-Z0-9_;]+"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+
+ <!-- The definition of a license to be referenced by the uses-license element. -->
+
+ <xsd:complexType name="licenseType">
+ <xsd:annotation>
+ <xsd:documentation>
+ A license definition. Such a license must be used later as a reference
+ using a uses-license element in one of the package elements.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="id" type="xsd:ID" />
+ <xsd:attribute name="type" type="xsd:token" fixed="text" />
+ </xsd:extension>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+ <!-- Type describing the license used by a package.
+ The license MUST be defined using a license node and referenced
+ using the ref attribute of the license element inside a package.
+ -->
+
+ <xsd:complexType name="usesLicenseType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Describes the license used by a package. The license MUST be defined
+ using a license node and referenced using the ref attribute of the
+ license element inside a package.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="ref" type="xsd:IDREF" />
+ </xsd:complexType>
+
+
+ <!-- A collection of files that can be downloaded for a given architecture.
+ The <archives> node is mandatory in the repository elements and the
+ collection must have at least one <archive> declared.
+ Each archive is a zip file that will be unzipped in a location that depends
+ on its package type.
+ -->
+
+ <xsd:complexType name="archivesType">
+ <xsd:annotation>
+ <xsd:documentation>
+ A collection of files that can be downloaded for a given architecture.
+ The <archives> node is mandatory in the repository packages and the
+ collection must have at least one <archive> declared.
+ Each archive is a zip file that will be unzipped in a location that depends
+ on its package type.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence minOccurs="1" maxOccurs="unbounded">
+ <!-- One archive file -->
+ <xsd:element name="archive">
+ <xsd:complexType>
+ <!-- Properties of the archive file -->
+ <xsd:all>
+ <!-- The size in bytes of the archive to download. -->
+ <xsd:element name="size" type="xsd:positiveInteger" />
+ <!-- The checksum of the archive file. -->
+ <xsd:element name="checksum" type="sdk:checksumType" />
+ <!-- The URL is an absolute URL if it starts with http://, https://
+ or ftp://. Otherwise it is relative to the parent directory that
+ contains this repository.xml -->
+ <xsd:element name="url" type="xsd:token" />
+
+ <xsd:element name="host-os" type="sdk:osType" minOccurs="0" />
+ <xsd:element name="host-bits" type="sdk:bitSizeType" minOccurs="0" />
+ <xsd:element name="jvm-bits" type="sdk:bitSizeType" minOccurs="0" />
+ <xsd:element name="min-jvm-version" type="sdk:jvmVersionType" minOccurs="0" />
+ </xsd:all>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+
+
+ <!-- A collection of file paths available in an <extra> package
+ that can be installed in an Android project.
+ If present, the <project-files> collection must contain at least one path.
+ Each path is relative to the root directory of the package.
+ -->
+
+ <xsd:complexType name="projectFilesType">
+ <xsd:annotation>
+ <xsd:documentation>
+ A collection of file paths available in an <extra> package
+ that can be installed in an Android project.
+ If present, the <project-files> collection must contain at least one path.
+ Each path is relative to the root directory of the package.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence minOccurs="1" maxOccurs="unbounded">
+ <!-- One JAR Path, relative to the root folder of the package. -->
+ <xsd:element name="path" type="xsd:string" />
+ </xsd:sequence>
+ </xsd:complexType>
+
+
+ <!-- The definition of archive filters -->
+
+ <xsd:simpleType name="bitSizeType">
+ <xsd:annotation>
+ <xsd:documentation>A CPU bit size filter.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="32" />
+ <xsd:enumeration value="64" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="osType">
+ <xsd:annotation>
+ <xsd:documentation>A host OS filter.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="linux" />
+ <xsd:enumeration value="macosx" />
+ <xsd:enumeration value="windows" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="jvmVersionType">
+ <xsd:annotation>
+ <xsd:documentation>A JVM version number, e.g. "1" or "1.6" or "1.14.15".</xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:string">
+ <xsd:pattern value="([1-9](\.[1-9]{1,2}){0,2})"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+
+ <!-- The definition of a file checksum -->
+
+ <xsd:simpleType name="sha1Number">
+ <xsd:annotation>
+ <xsd:documentation>A SHA1 checksum.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:string">
+ <xsd:pattern value="([0-9a-fA-F]){40}"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:complexType name="checksumType">
+ <xsd:annotation>
+ <xsd:documentation>A file checksum, currently only SHA1.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:extension base="sdk:sha1Number">
+ <xsd:attribute name="type" type="xsd:token" fixed="sha1" />
+ </xsd:extension>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+</xsd:schema>
diff --git a/repository/sdk-repository-1.xsd b/repository/sdk-repository-01.xsd
similarity index 100%
rename from repository/sdk-repository-1.xsd
rename to repository/sdk-repository-01.xsd
diff --git a/repository/sdk-repository-2.xsd b/repository/sdk-repository-02.xsd
similarity index 100%
rename from repository/sdk-repository-2.xsd
rename to repository/sdk-repository-02.xsd
diff --git a/repository/sdk-repository-3.xsd b/repository/sdk-repository-03.xsd
similarity index 100%
rename from repository/sdk-repository-3.xsd
rename to repository/sdk-repository-03.xsd
diff --git a/repository/sdk-repository-4.xsd b/repository/sdk-repository-04.xsd
similarity index 100%
rename from repository/sdk-repository-4.xsd
rename to repository/sdk-repository-04.xsd
diff --git a/repository/sdk-repository-5.xsd b/repository/sdk-repository-05.xsd
similarity index 100%
rename from repository/sdk-repository-5.xsd
rename to repository/sdk-repository-05.xsd
diff --git a/repository/sdk-repository-6.xsd b/repository/sdk-repository-06.xsd
similarity index 100%
rename from repository/sdk-repository-6.xsd
rename to repository/sdk-repository-06.xsd
diff --git a/repository/sdk-repository-7.xsd b/repository/sdk-repository-07.xsd
similarity index 100%
rename from repository/sdk-repository-7.xsd
rename to repository/sdk-repository-07.xsd
diff --git a/repository/sdk-repository-8.xsd b/repository/sdk-repository-08.xsd
similarity index 99%
rename from repository/sdk-repository-8.xsd
rename to repository/sdk-repository-08.xsd
index ade39d6..0c4ca63 100755
--- a/repository/sdk-repository-8.xsd
+++ b/repository/sdk-repository-08.xsd
@@ -76,7 +76,7 @@
<revision> -> <preview> and is only for <tool> and <platform-tool> packages.
- <min-tools-rev> and <min-platform-tools-rev> also become a full revision element.
- - v8 is used by the SDK Manager in Tools r22:
+ - v8 is used by the SDK Manager in Tools r22.0:
- It introduces the new <build-tool> repository type, which contains build-specific
tools that were before placed in either <tool> or <platform-tool> (e.g. ant,
aapt, aidl, etc.)
diff --git a/repository/sdk-repository-8.xsd b/repository/sdk-repository-09.xsd
similarity index 96%
copy from repository/sdk-repository-8.xsd
copy to repository/sdk-repository-09.xsd
index ade39d6..1b9d68d 100755
--- a/repository/sdk-repository-8.xsd
+++ b/repository/sdk-repository-09.xsd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
* limitations under the License.
-->
<xsd:schema
- targetNamespace="http://schemas.android.com/sdk/android/repository/8"
+ targetNamespace="http://schemas.android.com/sdk/android/repository/9"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:sdk="http://schemas.android.com/sdk/android/repository/8"
+ xmlns:sdk="http://schemas.android.com/sdk/android/repository/9"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1">
@@ -76,11 +76,14 @@
<revision> -> <preview> and is only for <tool> and <platform-tool> packages.
- <min-tools-rev> and <min-platform-tools-rev> also become a full revision element.
- - v8 is used by the SDK Manager in Tools r22:
+ - v8 is used by the SDK Manager in Tools r22.0:
- It introduces the new <build-tool> repository type, which contains build-specific
tools that were before placed in either <tool> or <platform-tool> (e.g. ant,
aapt, aidl, etc.)
- <tool> has a new "min-build-tool" attribute.
+
+ - v9 is used by the SDK Manager in Tools r22.6:
+ - It introduces a sub-tag for the <system-image> repository type.
-->
<xsd:element name="sdk-repository" type="sdk:repositoryType" />
@@ -104,6 +107,7 @@
</xsd:choice>
</xsd:complexType>
+
<!-- The definition of an SDK platform package. -->
<xsd:complexType name="platformType">
@@ -184,6 +188,10 @@
</xsd:documentation>
</xsd:annotation>
<xsd:all>
+ <!-- Implementation detail:
+ any change here must be synchronized within a new sdk-sys-img-N.xsd
+ -->
+
<!-- api-level + codename identifies the platform to which this system image belongs. -->
<!-- The Android API Level for the platform. An int > 0. -->
@@ -195,6 +203,11 @@
package is generated. -->
<xsd:element name="revision" type="xsd:positiveInteger" />
+ <!-- The tag of the system emulated by this image. -->
+ <xsd:element name="tag-id" type="sdk:idType" />
+ <!-- The displayed tag of the system emulated by this image. Optional. -->
+ <xsd:element name="tag-display" type="xsd:normalizedString" minOccurs="0" />
+
<!-- The ABI of the system emulated by this image. -->
<xsd:element name="abi" type="sdk:abiType" />
@@ -220,6 +233,18 @@
</xsd:complexType>
+ <xsd:simpleType name="idType">
+ <xsd:annotation>
+ <xsd:documentation>
+ A tag string for a system image can only be a simple alphanumeric string.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:pattern value="[a-zA-Z0-9_-]+"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+
<!-- The definition of the ABI supported by a platform's system image. -->
<xsd:simpleType name="abiType">
diff --git a/repository/sdk-repository-8.xsd b/repository/sdk-repository-10.xsd
similarity index 88%
copy from repository/sdk-repository-8.xsd
copy to repository/sdk-repository-10.xsd
index ade39d6..3fc1d92 100755
--- a/repository/sdk-repository-8.xsd
+++ b/repository/sdk-repository-10.xsd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
* limitations under the License.
-->
<xsd:schema
- targetNamespace="http://schemas.android.com/sdk/android/repository/8"
+ targetNamespace="http://schemas.android.com/sdk/android/repository/10"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:sdk="http://schemas.android.com/sdk/android/repository/8"
+ xmlns:sdk="http://schemas.android.com/sdk/android/repository/10"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1">
@@ -76,11 +76,20 @@
<revision> -> <preview> and is only for <tool> and <platform-tool> packages.
- <min-tools-rev> and <min-platform-tools-rev> also become a full revision element.
- - v8 is used by the SDK Manager in Tools r22:
+ - v8 is used by the SDK Manager in Tools r22.0:
- It introduces the new <build-tool> repository type, which contains build-specific
tools that were before placed in either <tool> or <platform-tool> (e.g. ant,
aapt, aidl, etc.)
- <tool> has a new "min-build-tool" attribute.
+
+ - v9 is used by the SDK Manager in Tools r22.6:
+ - It introduces a sub-tag for the <system-image> repository type.
+
+ - v10 is used by the SDK Manager in Tools r22.6.4:
+ - It introduces a <list-display> string for all package types.
+ - It removes the <system-image> type (system images are handled by sdk-sys-img-3.xsd)
+ - it changes <archive os=... arch=...> to sub-elements: <host-os>, <host-bits>,
+ <jvm-bits> and <min-jvm-version>.
-->
<xsd:element name="sdk-repository" type="sdk:repositoryType" />
@@ -93,7 +102,6 @@
</xsd:annotation>
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element name="platform" type="sdk:platformType" />
- <xsd:element name="system-image" type="sdk:systemImageType" />
<xsd:element name="source" type="sdk:sourceType" />
<xsd:element name="tool" type="sdk:toolType" />
<xsd:element name="platform-tool" type="sdk:platformToolType" />
@@ -104,6 +112,7 @@
</xsd:choice>
</xsd:complexType>
+
<!-- The definition of an SDK platform package. -->
<xsd:complexType name="platformType">
@@ -121,6 +130,9 @@
package is generated. -->
<xsd:element name="revision" type="xsd:positiveInteger" />
+ <!-- The optional display list item. When missing, it is auto-computed. -->
+ <xsd:element name="list-display" type="xsd:normalizedString" minOccurs="0" />
+
<!-- Information on the layoutlib packaged in this platform. -->
<xsd:element name="layoutlib" type="sdk:layoutlibType" />
@@ -175,51 +187,6 @@
</xsd:complexType>
- <!-- The definition of a system image used by a platform. -->
-
- <xsd:complexType name="systemImageType" >
- <xsd:annotation>
- <xsd:documentation>
- System Image for a platform.
- </xsd:documentation>
- </xsd:annotation>
- <xsd:all>
- <!-- api-level + codename identifies the platform to which this system image belongs. -->
-
- <!-- The Android API Level for the platform. An int > 0. -->
- <xsd:element name="api-level" type="xsd:positiveInteger" />
- <!-- The optional codename for this platform, if it's a preview. -->
- <xsd:element name="codename" type="xsd:string" minOccurs="0" />
-
- <!-- The revision, an int > 0, incremented each time a new
- package is generated. -->
- <xsd:element name="revision" type="xsd:positiveInteger" />
-
- <!-- The ABI of the system emulated by this image. -->
- <xsd:element name="abi" type="sdk:abiType" />
-
- <!-- The optional license of this package. If present, users will have
- to agree to it before downloading. -->
- <xsd:element name="uses-license" type="sdk:usesLicenseType" minOccurs="0" />
- <!-- The optional description of this package. -->
- <xsd:element name="description" type="xsd:string" minOccurs="0" />
- <!-- The optional description URL of this package -->
- <xsd:element name="desc-url" type="xsd:token" minOccurs="0" />
- <!-- The optional release note for this package. -->
- <xsd:element name="release-note" type="xsd:string" minOccurs="0" />
- <!-- The optional release note URL of this package -->
- <xsd:element name="release-url" type="xsd:token" minOccurs="0" />
-
- <!-- A list of file archives for this package. -->
- <xsd:element name="archives" type="sdk:archivesType" />
-
- <!-- An optional element indicating the package is obsolete.
- The string content is however currently not defined and ignored. -->
- <xsd:element name="obsolete" type="xsd:string" minOccurs="0" />
- </xsd:all>
- </xsd:complexType>
-
-
<!-- The definition of the ABI supported by a platform's system image. -->
<xsd:simpleType name="abiType">
@@ -255,6 +222,9 @@
package is generated. -->
<xsd:element name="revision" type="xsd:positiveInteger" />
+ <!-- The optional display list item. When missing, it is auto-computed. -->
+ <xsd:element name="list-display" type="xsd:normalizedString" minOccurs="0" />
+
<!-- The optional license of this package. If present, users will have
to agree to it before downloading. -->
<xsd:element name="uses-license" type="sdk:usesLicenseType" minOccurs="0" />
@@ -288,6 +258,9 @@
time a new package is generated. -->
<xsd:element name="revision" type="sdk:revisionType" />
+ <!-- The optional display list item. When missing, it is auto-computed. -->
+ <xsd:element name="list-display" type="xsd:normalizedString" minOccurs="0" />
+
<!-- The optional license of this package. If present, users will have
to agree to it before downloading. -->
<xsd:element name="uses-license" type="sdk:usesLicenseType" minOccurs="0" />
@@ -324,6 +297,9 @@
time a new package is generated. -->
<xsd:element name="revision" type="sdk:revisionType" />
+ <!-- The optional display list item. When missing, it is auto-computed. -->
+ <xsd:element name="list-display" type="xsd:normalizedString" minOccurs="0" />
+
<!-- The optional license of this package. If present, users will have
to agree to it before downloading. -->
<xsd:element name="uses-license" type="sdk:usesLicenseType" minOccurs="0" />
@@ -357,6 +333,9 @@
<!-- optional elements -->
+ <!-- The optional display list item. When missing, it is auto-computed. -->
+ <xsd:element name="list-display" type="xsd:normalizedString" minOccurs="0" />
+
<!-- The optional license of this package. If present, users will have
to agree to it before downloading. -->
<xsd:element name="uses-license" type="sdk:usesLicenseType" minOccurs="0" />
@@ -390,6 +369,9 @@
<!-- The optional codename for this doc, if it's a preview. -->
<xsd:element name="codename" type="xsd:string" minOccurs="0" />
+ <!-- The optional display list item. When missing, it is auto-computed. -->
+ <xsd:element name="list-display" type="xsd:normalizedString" minOccurs="0" />
+
<!-- The revision, an int > 0, incremented each time a new
package is generated. -->
<xsd:element name="revision" type="xsd:positiveInteger" />
@@ -427,6 +409,9 @@
<!-- The optional codename for this doc, if it's a preview. -->
<xsd:element name="codename" type="xsd:string" minOccurs="0" />
+ <!-- The optional display list item. When missing, it is auto-computed. -->
+ <xsd:element name="list-display" type="xsd:normalizedString" minOccurs="0" />
+
<!-- The revision, an int > 0, incremented each time a new
package is generated. -->
<xsd:element name="revision" type="xsd:positiveInteger" />
@@ -547,29 +532,12 @@
or ftp://. Otherwise it is relative to the parent directory that
contains this repository.xml -->
<xsd:element name="url" type="xsd:token" />
- </xsd:all>
- <!-- Attributes that identify the OS and architecture -->
- <xsd:attribute name="os" use="required">
- <xsd:simpleType>
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="any" />
- <xsd:enumeration value="linux" />
- <xsd:enumeration value="macosx" />
- <xsd:enumeration value="windows" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="arch" use="optional">
- <xsd:simpleType>
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="any" />
- <xsd:enumeration value="ppc" />
- <xsd:enumeration value="x86" />
- <xsd:enumeration value="x86_64" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
+ <xsd:element name="host-os" type="sdk:osType" minOccurs="0" />
+ <xsd:element name="host-bits" type="sdk:bitSizeType" minOccurs="0" />
+ <xsd:element name="jvm-bits" type="sdk:bitSizeType" minOccurs="0" />
+ <xsd:element name="min-jvm-version" type="sdk:jvmVersionType" minOccurs="0" />
+ </xsd:all>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
@@ -627,6 +595,39 @@
</xsd:complexType>
+ <!-- The definition of archive filters -->
+
+ <xsd:simpleType name="bitSizeType">
+ <xsd:annotation>
+ <xsd:documentation>A CPU bit size filter.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="32" />
+ <xsd:enumeration value="64" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="osType">
+ <xsd:annotation>
+ <xsd:documentation>A host OS filter.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="linux" />
+ <xsd:enumeration value="macosx" />
+ <xsd:enumeration value="windows" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="jvmVersionType">
+ <xsd:annotation>
+ <xsd:documentation>A JVM version number, e.g. "1" or "1.6" or "1.14.15".</xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:string">
+ <xsd:pattern value="([1-9](\.[1-9]{1,2}){0,2})"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+
<!-- The definition of a file checksum -->
<xsd:simpleType name="sha1Number">
diff --git a/repository/sdk-sys-img-1.xsd b/repository/sdk-sys-img-01.xsd
similarity index 98%
rename from repository/sdk-sys-img-1.xsd
rename to repository/sdk-sys-img-01.xsd
index a19aa49..005b431 100755
--- a/repository/sdk-sys-img-1.xsd
+++ b/repository/sdk-sys-img-01.xsd
@@ -30,7 +30,7 @@
file that conforms to this XML Schema.
History:
- - v1 is used by the SDK Updater in Tools r20. It is split out of the
+ - v1 is used by the SDK Updater in Tools r20.0. It is split out of the
main SDK Repository XML Schema and can only contain <system-image> packages.
-->
diff --git a/repository/sdk-sys-img-1.xsd b/repository/sdk-sys-img-02.xsd
similarity index 90%
copy from repository/sdk-sys-img-1.xsd
copy to repository/sdk-sys-img-02.xsd
index a19aa49..a1c16a3 100755
--- a/repository/sdk-sys-img-1.xsd
+++ b/repository/sdk-sys-img-02.xsd
@@ -15,9 +15,9 @@
* limitations under the License.
-->
<xsd:schema
- targetNamespace="http://schemas.android.com/sdk/android/sys-img/1"
+ targetNamespace="http://schemas.android.com/sdk/android/sys-img/2"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/1"
+ xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/2"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1">
@@ -30,8 +30,11 @@
file that conforms to this XML Schema.
History:
- - v1 is used by the SDK Updater in Tools r20. It is split out of the
+ - v1 is used by the SDK Updater in Tools r20.0. It is split out of the
main SDK Repository XML Schema and can only contain <system-image> packages.
+
+ - v2 is used by the SDK Manager in Tools r22.6.
+ It introduces a sub-tag for the <system-image> repository type.
-->
<xsd:element name="sdk-sys-img" type="sdk:repositoryType" />
@@ -69,6 +72,11 @@
package is generated. -->
<xsd:element name="revision" type="xsd:positiveInteger" />
+ <!-- The tag of the system emulated by this image. -->
+ <xsd:element name="tag-id" type="sdk:idType" />
+ <!-- The displayed tag of the system emulated by this image. Optional. -->
+ <xsd:element name="tag-display" type="xsd:normalizedString" minOccurs="0" />
+
<!-- The ABI of the system emulated by this image. -->
<xsd:element name="abi" type="sdk:abiType" />
@@ -94,6 +102,18 @@
</xsd:complexType>
+ <xsd:simpleType name="idType">
+ <xsd:annotation>
+ <xsd:documentation>
+ An tag string for a system image can only be simple alphanumeric string.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:pattern value="[a-zA-Z0-9_-]+"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+
<!-- The definition of the ABI supported by a platform's system image. -->
<xsd:simpleType name="abiType">
diff --git a/repository/sdk-sys-img-1.xsd b/repository/sdk-sys-img-03.xsd
similarity index 73%
copy from repository/sdk-sys-img-1.xsd
copy to repository/sdk-sys-img-03.xsd
index a19aa49..be6fc61 100755
--- a/repository/sdk-sys-img-1.xsd
+++ b/repository/sdk-sys-img-03.xsd
@@ -15,9 +15,9 @@
* limitations under the License.
-->
<xsd:schema
- targetNamespace="http://schemas.android.com/sdk/android/sys-img/1"
+ targetNamespace="http://schemas.android.com/sdk/android/sys-img/3"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/1"
+ xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1">
@@ -30,8 +30,17 @@
file that conforms to this XML Schema.
History:
- - v1 is used by the SDK Updater in Tools r20. It is split out of the
+ - v1 is used by the SDK Updater in Tools r20.0. It is split out of the
main SDK Repository XML Schema and can only contain <system-image> packages.
+
+ - v2 is used by the SDK Manager in Tools r22.6.
+ It introduces a sub-tag for the <system-image> repository type.
+
+ - v3 is used by the SDK Manager in Tools r22.6.4:
+ - It introduces a <list-display> string for all package types.
+ - it changes <archive os=... arch=...> to sub-elements: <host-os>, <host-bits>,
+ <jvm-bits> and <min-jvm-version>.
+ - Support for new ABIs arm64-v8a, x86_64 and mips64.
-->
<xsd:element name="sdk-sys-img" type="sdk:repositoryType" />
@@ -69,6 +78,14 @@
package is generated. -->
<xsd:element name="revision" type="xsd:positiveInteger" />
+ <!-- The tag of the system emulated by this image. -->
+ <xsd:element name="tag-id" type="sdk:idType" />
+ <!-- The displayed tag of the system emulated by this image. Optional. -->
+ <xsd:element name="tag-display" type="xsd:normalizedString" minOccurs="0" />
+
+ <!-- The optional display list item. When missing, it is auto-computed. -->
+ <xsd:element name="list-display" type="xsd:normalizedString" minOccurs="0" />
+
<!-- The ABI of the system emulated by this image. -->
<xsd:element name="abi" type="sdk:abiType" />
@@ -94,6 +111,18 @@
</xsd:complexType>
+ <xsd:simpleType name="idType">
+ <xsd:annotation>
+ <xsd:documentation>
+ An tag string for a system image can only be simple alphanumeric string.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:pattern value="[a-zA-Z0-9_-]+"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+
<!-- The definition of the ABI supported by a platform's system image. -->
<xsd:simpleType name="abiType">
@@ -103,8 +132,11 @@
<xsd:restriction base="xsd:token">
<xsd:enumeration value="armeabi" />
<xsd:enumeration value="armeabi-v7a" />
+ <xsd:enumeration value="arm64-v8a" />
<xsd:enumeration value="x86" />
+ <xsd:enumeration value="x86_64" />
<xsd:enumeration value="mips" />
+ <xsd:enumeration value="mips64" />
</xsd:restriction>
</xsd:simpleType>
@@ -175,35 +207,51 @@
or ftp://. Otherwise it is relative to the parent directory that
contains this repository.xml -->
<xsd:element name="url" type="xsd:token" />
- </xsd:all>
- <!-- Attributes that identify the OS and architecture -->
- <xsd:attribute name="os" use="required">
- <xsd:simpleType>
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="any" />
- <xsd:enumeration value="linux" />
- <xsd:enumeration value="macosx" />
- <xsd:enumeration value="windows" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="arch" use="optional">
- <xsd:simpleType>
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="any" />
- <xsd:enumeration value="ppc" />
- <xsd:enumeration value="x86" />
- <xsd:enumeration value="x86_64" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
+ <xsd:element name="host-os" type="sdk:osType" minOccurs="0" />
+ <xsd:element name="host-bits" type="sdk:bitSizeType" minOccurs="0" />
+ <xsd:element name="jvm-bits" type="sdk:bitSizeType" minOccurs="0" />
+ <xsd:element name="min-jvm-version" type="sdk:jvmVersionType" minOccurs="0" />
+ </xsd:all>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
</xsd:complexType>
+ <!-- The definition of archive filters -->
+
+ <xsd:simpleType name="bitSizeType">
+ <xsd:annotation>
+ <xsd:documentation>A CPU bit size filter.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="32" />
+ <xsd:enumeration value="64" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="osType">
+ <xsd:annotation>
+ <xsd:documentation>A host OS filter.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="linux" />
+ <xsd:enumeration value="macosx" />
+ <xsd:enumeration value="windows" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="jvmVersionType">
+ <xsd:annotation>
+ <xsd:documentation>A JVM version number, e.g. "1" or "1.6" or "1.14.15".</xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:string">
+ <xsd:pattern value="([1-9](\.[1-9]{1,2}){0,2})"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+
<!-- The definition of a file checksum -->
<xsd:simpleType name="sha1Number">
