OSDN > Developer >

mnstshlylh > Chamber > development > Commit

منصة شليله
Fork

Commit

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

--- a/build/sdk-darwin-x86.atree

+++ b/build/sdk-darwin-x86.atree

		@@ -1,5 +1,30 @@
1		-# Copyright 2007 The Android Open Source Project
2	1	#
	2	+# Copyright (C) 2007 The Android Open Source Project
	3	+#
	4	+# Licensed under the Apache License, Version 2.0 (the "License");
	5	+# you may not use this file except in compliance with the License.
	6	+# You may obtain a copy of the License at
	7	+#
	8	+# http://www.apache.org/licenses/LICENSE-2.0
	9	+#
	10	+# Unless required by applicable law or agreed to in writing, software
	11	+# distributed under the License is distributed on an "AS IS" BASIS,
	12	+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	13	+# See the License for the specific language governing permissions and
	14	+# limitations under the License.
	15	+#
	16	+
	17	+##############################################################################
	18	+# Platform Tools Component
	19	+##############################################################################
	20	+
	21	+prebuilt/darwin-x86/llvm-rs-cc/llvm-rs-cc platform-tools/llvm-rs-cc
	22	+
	23	+
	24	+##############################################################################
	25	+# Tools Component
	26	+# Legacy: this should be moved to sdk/build/tools.atree
	27	+##############################################################################
3	28
4	29	# swt
5	30	prebuilt/darwin-x86/swt/swt.jar tools/lib/x86/swt.jar

--- a/build/sdk-linux-x86.atree

+++ b/build/sdk-linux-x86.atree

		@@ -1,5 +1,30 @@
1		-# Copyright 2007 The Android Open Source Project
2	1	#
	2	+# Copyright (C) 2007 The Android Open Source Project
	3	+#
	4	+# Licensed under the Apache License, Version 2.0 (the "License");
	5	+# you may not use this file except in compliance with the License.
	6	+# You may obtain a copy of the License at
	7	+#
	8	+# http://www.apache.org/licenses/LICENSE-2.0
	9	+#
	10	+# Unless required by applicable law or agreed to in writing, software
	11	+# distributed under the License is distributed on an "AS IS" BASIS,
	12	+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	13	+# See the License for the specific language governing permissions and
	14	+# limitations under the License.
	15	+#
	16	+
	17	+##############################################################################
	18	+# Platform Tools Component
	19	+##############################################################################
	20	+
	21	+prebuilt/linux-x86/llvm-rs-cc/llvm-rs-cc platform-tools/llvm-rs-cc
	22	+
	23	+
	24	+##############################################################################
	25	+# Tools Component
	26	+# Legacy: this should be moved to sdk/build/tools.atree
	27	+##############################################################################
3	28
4	29	# swt
5	30	prebuilt/linux-x86/swt/swt.jar tools/lib/x86/swt.jar

--- a/build/sdk.atree

+++ b/build/sdk.atree

		@@ -1,4 +1,4 @@
1		- #
	1	+#
2	2	# Copyright (C) 2007 The Android Open Source Project
3	3	#
4	4	# Licensed under the Apache License, Version 2.0 (the "License");

		@@ -41,7 +41,9 @@ frameworks/base/docs/docs-redirect.html documentation.html
41	41	bin/adb platform-tools/adb
42	42	bin/aapt platform-tools/aapt
43	43	bin/aidl platform-tools/aidl
44		-bin/llvm-rs-cc platform-tools/llvm-rs-cc
	44	+bin/llvm-rs-cc platform-tools/llvm-rs-cc-2
	45	+development/sdk/llvm-rs-cc.txt platform-tools/llvm-rs-cc.txt
	46	+
45	47	# dx
46	48	bin/dx platform-tools/dx
47	49	bin/dexdump platform-tools/dexdump

--- /dev/null

+++ b/sdk/llvm-rs-cc.txt

		@@ -0,0 +1,6 @@
	1	+# map versions of the llvm-rs-cc compiler with the min API level.
	2	+# <compiler version>:<api leve>
	3	+# the compiler version number maps to the filename llvm-rs-cc-<version>[.exe]
	4	+# except for version 1 which is simply llvm-rs-cc[.exe]
	5	+1:11
	6	+2:12
		\ No newline at end of file

--- a/sdk/plat_tools_source.properties

+++ b/sdk/plat_tools_source.properties