LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am c04b7aad: SDK Repository: switch to sdk addon revision 6.

Browse Source 
* commit 'c04b7aad0df26465d80775d8dd893fdc7a484b16':
  SDK Repository: switch to sdk addon revision 6.
This commit is contained in:
Raphael Moll
2013-11-26 14:14:35 -08:00
committed by Android Git Automerger
parent b652393dd5 c04b7aad0d
commit f7624c5a38
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/tools/mk_sdk_repo_xml.sh
View File

@@ -139,6 +139,10 @@ ATTRS=(
# Starting with XSD repo-7 and addon-5, some revision elements are no longer just # 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 # 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. # 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 ]] || if [[ "$ROOT" == "sdk-repository" && "$XSD_VERSION" -ge 7 ]] ||
[[ "$ROOT" == "sdk-addon" && "$XSD_VERSION" -ge 5 ]]; then [[ "$ROOT" == "sdk-addon" && "$XSD_VERSION" -ge 5 ]]; then
@@ -146,6 +150,7 @@ FULL_REVISIONS=(
tool revision tool revision
build-tool revision build-tool revision
platform-tool revision platform-tool revision
extra revision
@ min-tools-rev @ min-tools-rev
@ min-platform-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". # 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 # optional "rc" (e.g. '1 rc4', not '1rc4') and no space after
# the rc (so not '1 rc 4' either) # the rc (so not '1 rc 4' either)
function write_full_revision() { function write_full_revision() {