From e3d7035cd51721998c551a4a17c3a0e30c43ed8c Mon Sep 17 00:00:00 2001
From: Raphael Moll <raphael@google.com>
Date: Tue, 5 Nov 2013 13:07:30 -0800
Subject: [PATCH] Prepare SDK for KLP MR1. Do not merge.

System images are in 19 rev 2 for MR1 (since they have minor.major)

platform-tools: update the API diff file that lint uses (not automated yet.)
build-tools: llvm-rs-cc issue affecting RS NDK mode in Gradle.

Note that support is set to 19.0.1 which means it will have to be
released using the new addon.xsd format that allows extras to have a
major.micro.minor format. That will be an interesting way to test this
feature.

Change-Id: Id755770f8a121edffa36e0fcb70488c452087440
---
 sdk/build_tools_source.prop_template        | 2 +-
 sdk/doc_source.prop_template                | 2 +-
 sdk/images_armeabi-v7a_source.prop_template | 2 +-
 sdk/images_armeabi_source.prop_template     | 2 +-
 sdk/images_x86_source.prop_template         | 2 +-
 sdk/plat_tools_source.prop_template         | 2 +-
 sdk/source_source.prop_template             | 2 +-
 sdk/support_source.prop_template            | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index 5d623074d..b83af7f4b 100644
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,3 +1,3 @@
 Pkg.UserSrc=false
-Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1
 
diff --git a/sdk/doc_source.prop_template b/sdk/doc_source.prop_template
index d3cdfd5ee..523d6bda8 100644
--- a/sdk/doc_source.prop_template
+++ b/sdk/doc_source.prop_template
@@ -1,4 +1,4 @@
 Pkg.UserSrc=false
-Pkg.Revision=1
+Pkg.Revision=2
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
diff --git a/sdk/images_armeabi-v7a_source.prop_template b/sdk/images_armeabi-v7a_source.prop_template
index 86fc2a0bb..4f2daacd9 100644
--- a/sdk/images_armeabi-v7a_source.prop_template
+++ b/sdk/images_armeabi-v7a_source.prop_template
@@ -1,6 +1,6 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
-Pkg.Revision=1
+Pkg.Revision=2
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=armeabi-v7a
diff --git a/sdk/images_armeabi_source.prop_template b/sdk/images_armeabi_source.prop_template
index 8644d1006..906e378fd 100644
--- a/sdk/images_armeabi_source.prop_template
+++ b/sdk/images_armeabi_source.prop_template
@@ -1,6 +1,6 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
-Pkg.Revision=1
+Pkg.Revision=2
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=armeabi
diff --git a/sdk/images_x86_source.prop_template b/sdk/images_x86_source.prop_template
index a587cd167..90024ea50 100644
--- a/sdk/images_x86_source.prop_template
+++ b/sdk/images_x86_source.prop_template
@@ -1,6 +1,6 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
-Pkg.Revision=1
+Pkg.Revision=2
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=x86
diff --git a/sdk/plat_tools_source.prop_template b/sdk/plat_tools_source.prop_template
index 5d623074d..b83af7f4b 100644
--- a/sdk/plat_tools_source.prop_template
+++ b/sdk/plat_tools_source.prop_template
@@ -1,3 +1,3 @@
 Pkg.UserSrc=false
-Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1
 
diff --git a/sdk/source_source.prop_template b/sdk/source_source.prop_template
index d3cdfd5ee..523d6bda8 100644
--- a/sdk/source_source.prop_template
+++ b/sdk/source_source.prop_template
@@ -1,4 +1,4 @@
 Pkg.UserSrc=false
-Pkg.Revision=1
+Pkg.Revision=2
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
diff --git a/sdk/support_source.prop_template b/sdk/support_source.prop_template
index ba7e6fb1a..f89771291 100644
--- a/sdk/support_source.prop_template
+++ b/sdk/support_source.prop_template
@@ -1,5 +1,5 @@
 Pkg.UserSrc=false
-Pkg.Revision=${PLATFORM_SDK_VERSION}
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1
 Extra.Vendor=android
 Extra.VendorId=android
 Extra.VendorDisplay=Android