diff options
| author | Raphael Moll <ralf@android.com> | 2013-09-30 11:57:17 -0700 |
|---|---|---|
| committer | Raphael Moll <raphael@google.com> | 2013-11-26 14:05:47 -0800 |
| commit | c04b7aad0df26465d80775d8dd893fdc7a484b16 (patch) | |
| tree | 3e11cf8a3c8d056324267444359402215c0ff48b | |
| parent | 888bd6a12473a4bfca36c691e187d9fc041411fe (diff) | |
| download | android_development-c04b7aad0df26465d80775d8dd893fdc7a484b16.tar.gz android_development-c04b7aad0df26465d80775d8dd893fdc7a484b16.tar.bz2 android_development-c04b7aad0df26465d80775d8dd893fdc7a484b16.zip | |
SDK Repository: switch to sdk addon revision 6.
addon-6.xsd changes <extra><revision> from an int (major only)
to a full <revision> element with major.micro.minor (but not
preview part.)
(cherry picked from commit 7657a590830cfe87fb2dc6ff03c0dcb7589c0bdf)
Change-Id: Iedff23a757dd3fd8d9e8006a2aec072ce2c71e8d
| -rwxr-xr-x | build/tools/mk_sdk_repo_xml.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/tools/mk_sdk_repo_xml.sh b/build/tools/mk_sdk_repo_xml.sh index c807a56e4..0bb0e51f2 100755 --- a/build/tools/mk_sdk_repo_xml.sh +++ b/build/tools/mk_sdk_repo_xml.sh @@ -139,6 +139,10 @@ ATTRS=( # Starting with XSD repo-7 and addon-5, some revision elements are no longer just # integers. Instead they are in major.minor.micro.preview format. This defines # which elements. This depends on the XSD root element and the XSD version. +# +# Note: addon extra revision can't take a preview number. We don't enforce +# this in this script. Instead schema validation will fail if the extra +# source.property declares an RC and it gets inserted in the addon.xml here. if [[ "$ROOT" == "sdk-repository" && "$XSD_VERSION" -ge 7 ]] || [[ "$ROOT" == "sdk-addon" && "$XSD_VERSION" -ge 5 ]]; then @@ -146,6 +150,7 @@ FULL_REVISIONS=( tool revision build-tool revision platform-tool revision + extra revision @ min-tools-rev @ min-platform-tools-rev ) @@ -177,7 +182,7 @@ function needs_full_revision() { } # Parses and print a full revision in the form "1.2.3 rc4". -# Note that the format requires to have a # space before the +# Note that the format requires to have 1 space before the # optional "rc" (e.g. '1 rc4', not '1rc4') and no space after # the rc (so not '1 rc 4' either) function write_full_revision() { |