summaryrefslogtreecommitdiffstats
path: root/build/tools
diff options
context:
space:
mode:
authorRaphael Moll <raphael@google.com>2011-09-17 22:50:43 -0700
committerRaphael Moll <raphael@google.com>2011-09-17 22:50:43 -0700
commit3acd4823bb53ebcb5bdc50782b9675b6e4b5bb30 (patch)
treeb71200671bf74977c705e6a5d40d482248ea9f9d /build/tools
parentec48ca3dff7f5f377e35949a15492a70d0a8c2f8 (diff)
downloadandroid_development-3acd4823bb53ebcb5bdc50782b9675b6e4b5bb30.tar.gz
android_development-3acd4823bb53ebcb5bdc50782b9675b6e4b5bb30.tar.bz2
android_development-3acd4823bb53ebcb5bdc50782b9675b6e4b5bb30.zip
SDK: use XSD v5 props when generating repository packages.
This requires sdk.git Change-Id I6993d6c4 to build (to enable the use of XSD v5). Change-Id: If3beb09ae4eef3990caf661b2d4cfbdfd8a6f86a
Diffstat (limited to 'build/tools')
-rwxr-xr-xbuild/tools/mk_sdk_repo_xml.sh24
1 files changed, 21 insertions, 3 deletions
diff --git a/build/tools/mk_sdk_repo_xml.sh b/build/tools/mk_sdk_repo_xml.sh
index 56f426bb3..496ee6c84 100755
--- a/build/tools/mk_sdk_repo_xml.sh
+++ b/build/tools/mk_sdk_repo_xml.sh
@@ -86,12 +86,17 @@ ATTRS=(
Platform.Version version
AndroidVersion.ApiLevel api-level
AndroidVersion.CodeName codename
+ Platform.IncludedAbi included-abi
Platform.MinToolsRev min-tools-rev
Platform.MinPlatformToolsRev min-platform-tools-rev
- Extra.Path path
Extra.Vendor vendor
+ Extra.Path path
+ Extra.OldPaths old-paths
Extra.MinApiLevel min-api-level
Sample.MinApiLevel min-api-level
+ SystemImage.Abi abi
+ Layoutlib.Api layoutlib/api
+ Layoutlib.Revision layoutlib/revision
# for addon packages
vendor vendor
name name
@@ -124,14 +129,24 @@ function output_attributes() {
local OUT="$1"
shift
local KEY VALUE
+ local NODE LAST_NODE
while [[ "$1" ]]; do
KEY="$1"
VALUE="${2//@/ }"
+ NODE="${KEY%%/*}"
+ KEY="${KEY##*/}"
+ [[ "$NODE" == "$KEY" ]] && NODE=""
+ if [[ "$NODE" != "$LAST_NODE" ]]; then
+ [[ "$LAST_NODE" ]] && echo " </sdk:$LAST_NODE>" >> "$OUT"
+ LAST_NODE="$NODE"
+ [[ "$NODE" ]] && echo " <sdk:$NODE>" >> "$OUT"
+ fi
echo " <sdk:$KEY>$VALUE</sdk:$KEY>" >> "$OUT"
shift
shift
done
+ if [[ "$LAST_NODE" ]]; then echo " </sdk:$LAST_NODE>" >> "$OUT"; fi
}
while [[ -n "$1" ]]; do
@@ -168,13 +183,16 @@ while [[ -n "$1" ]]; do
# - description all
# - revision all
# - version platform
- # - api-level platform sample doc add-on
- # - codename platform sample doc add-on
+ # - included-abi platform
+ # - api-level platform sample doc add-on system-image
+ # - codename platform sample doc add-on system-image
# - min-tools-rev platform sample
# - min-platform-tools-rev tool
# - min-api-level extra
# - vendor extra add-on
# - path extra
+ # - old-paths extra
+ # - abi system-image
#
# We don't actually validate here.
# Just take whatever is defined and put it in the XML.