From 79aa3cea3a00276f49f6987bf1e49b40c3b011c0 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Wed, 25 May 2011 17:48:07 -0700
Subject: [PATCH] Prepare new plat-tools SDK component with 2 llvm versions.

The output of the platform tree build is llvm-rs-cc-2 and should
be used for apps targeting 12+. This is encoded in llvm-rs-cc.txt

The older (HC) version of llvm-rs-cc is copied from the prebuilt
and is used for apps targeting 11+.

Until new tools that can read/process llvm-rs-cc.txt are released,
old tools will use the HC version of llvm-rs-cc which ensure
proper compatibility.

Change-Id: Iddb924409cc9238531bf1a0448b14b7eac3396a5
---
 build/sdk-darwin-x86.atree       | 27 ++++++++++++++++++++++++++-
 build/sdk-linux-x86.atree        | 27 ++++++++++++++++++++++++++-
 build/sdk.atree                  |  6 ++++--
 sdk/llvm-rs-cc.txt               |  6 ++++++
 sdk/plat_tools_source.properties |  2 +-
 5 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 sdk/llvm-rs-cc.txt

diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index 120fff06f..bc88d169a 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -1,5 +1,30 @@
-# Copyright 2007 The Android Open Source Project
 #
+# Copyright (C) 2007 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.
+#
+
+##############################################################################
+# Platform Tools Component
+##############################################################################
+
+prebuilt/darwin-x86/llvm-rs-cc/llvm-rs-cc      platform-tools/llvm-rs-cc
+
+
+##############################################################################
+# Tools Component
+# Legacy: this should be moved to sdk/build/tools.atree
+##############################################################################
 
 # swt
 prebuilt/darwin-x86/swt/swt.jar tools/lib/x86/swt.jar
diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree
index eb878b54f..c74216e5f 100644
--- a/build/sdk-linux-x86.atree
+++ b/build/sdk-linux-x86.atree
@@ -1,5 +1,30 @@
-# Copyright 2007 The Android Open Source Project
 #
+# Copyright (C) 2007 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.
+#
+
+##############################################################################
+# Platform Tools Component
+##############################################################################
+
+prebuilt/linux-x86/llvm-rs-cc/llvm-rs-cc      platform-tools/llvm-rs-cc
+
+
+##############################################################################
+# Tools Component
+# Legacy: this should be moved to sdk/build/tools.atree
+##############################################################################
 
 # swt
 prebuilt/linux-x86/swt/swt.jar tools/lib/x86/swt.jar
diff --git a/build/sdk.atree b/build/sdk.atree
index c8f1bf5f1..65bc4cf4e 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -1,4 +1,4 @@
- #
+#
 # Copyright (C) 2007 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,7 +41,9 @@ frameworks/base/docs/docs-redirect.html documentation.html
 bin/adb                                       platform-tools/adb
 bin/aapt                                      platform-tools/aapt
 bin/aidl                                      platform-tools/aidl
-bin/llvm-rs-cc                                platform-tools/llvm-rs-cc
+bin/llvm-rs-cc                                platform-tools/llvm-rs-cc-2
+development/sdk/llvm-rs-cc.txt                platform-tools/llvm-rs-cc.txt
+
 # dx
 bin/dx                                        platform-tools/dx
 bin/dexdump                                   platform-tools/dexdump
diff --git a/sdk/llvm-rs-cc.txt b/sdk/llvm-rs-cc.txt
new file mode 100644
index 000000000..34f81ef78
--- /dev/null
+++ b/sdk/llvm-rs-cc.txt
@@ -0,0 +1,6 @@
+# map versions of the llvm-rs-cc compiler with the min API level.
+# <compiler version>:<api leve>
+# the compiler version number maps to the filename llvm-rs-cc-<version>[.exe]
+# except for version 1 which is simply llvm-rs-cc[.exe]
+1:11
+2:12
\ No newline at end of file
diff --git a/sdk/plat_tools_source.properties b/sdk/plat_tools_source.properties
index b75e326a5..47cffcf1a 100644
--- a/sdk/plat_tools_source.properties
+++ b/sdk/plat_tools_source.properties
@@ -1,2 +1,2 @@
 Pkg.UserSrc=false
-Pkg.Revision=4
+Pkg.Revision=6