Prepare new plat-tools SDK component with 2 llvm versions.

[android-x86/development.git] / build / sdk.atree

diff --git a/build/sdk.atree b/build/sdk.atree
index 58a5ccf..65bc4cf 100644 (file)
--- 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,13 +41,14 @@ 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
 framework/dx.jar                              platform-tools/lib/dx.jar
 
-sdk/files/sdk_files_NOTICE.txt                platform-tools/NOTICE.txt
 development/sdk/plat_tools_source.properties  platform-tools/source.properties
 
 ##############################################################################
@@ -55,10 +56,10 @@ development/sdk/plat_tools_source.properties  platform-tools/source.properties
 ##############################################################################
 
 # version files for the SDK updater, from sdk.git
-development/sdk/platform_source.properties platforms/${PLATFORM_NAME}/source.properties
+development/sdk/platform_source.properties    platforms/${PLATFORM_NAME}/source.properties
 
 # copy build prop from out/.../sdk/
-sdk/sdk-build.prop platforms/${PLATFORM_NAME}/build.prop
+sdk/sdk-build.prop                            platforms/${PLATFORM_NAME}/build.prop
 
 # the uper-jar file that apps link against. This is the public API
 ${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar
@@ -145,7 +146,7 @@ frameworks/base/docs/docs-samples-redirect.html docs/samples/index.html
 
 # samples to include in the sdk samples package
 #
-# the list here should match the list of samples that we generate docs for, 
+# the list here should match the list of samples that we generate docs for,
 # (see web_docs_sample_code_flags in frameworks/base/Android.mk)
 development/apps/GestureBuilder              samples/${PLATFORM_NAME}/GestureBuilder
 development/samples/source.properties        samples/${PLATFORM_NAME}/source.properties
@@ -167,6 +168,7 @@ development/samples/JetBoy                     samples/${PLATFORM_NAME}/JetBoy
 development/samples/LunarLander                samples/${PLATFORM_NAME}/LunarLander
 development/samples/MultiResolution            samples/${PLATFORM_NAME}/MultiResolution
 development/samples/NotePad                    samples/${PLATFORM_NAME}/NotePad
+development/samples/RandomMusicPlayer          samples/${PLATFORM_NAME}/RandomMusicPlayer
 development/samples/SampleSyncAdapter          samples/${PLATFORM_NAME}/SampleSyncAdapter
 development/samples/SearchableDictionary       samples/${PLATFORM_NAME}/SearchableDictionary
 development/samples/SipDemo                    samples/${PLATFORM_NAME}/SipDemo
@@ -177,6 +179,8 @@ development/samples/Spinner                    samples/${PLATFORM_NAME}/Spinner
 development/samples/SpinnerTest                samples/${PLATFORM_NAME}/SpinnerTest
 development/samples/TicTacToeLib               samples/${PLATFORM_NAME}/TicTacToeLib
 development/samples/TicTacToeMain              samples/${PLATFORM_NAME}/TicTacToeMain
+development/samples/USB/MissileLauncher        samples/${PLATFORM_NAME}/USB/MissileLauncher
+development/samples/USB/AdbTest                samples/${PLATFORM_NAME}/USB/AdbTest
 development/samples/VoiceRecognitionService    samples/${PLATFORM_NAME}/VoiceRecognitionService
 development/samples/WeatherListWidget          samples/${PLATFORM_NAME}/WeatherListWidget
 development/apps/WidgetPreview                 samples/${PLATFORM_NAME}/WidgetPreview
@@ -193,8 +197,22 @@ development/samples/RenderScript/MiscSamples   samples/${PLATFORM_NAME}/RenderSc
 sdk/files/sdk_files_NOTICE.txt samples/${PLATFORM_NAME}/NOTICE.txt
 
 ##############################################################################
-# Samples Component
+# Add-on Folder
 ##############################################################################
 
 # empty add-on folder with just a readme copied from sdk.git
 sdk/files/README_add-ons.txt add-ons/README.txt
+
+##############################################################################
+# Extra Component: Compatibility
+##############################################################################
+
+development/sdk/compatibility_source.properties                                                   extras/android/compatibility/source.properties
+development/sdk/compatibility_README.txt                                                          extras/android/compatibility/README.txt
+sdk/files/sdk_files_NOTICE.txt                                                                    extras/android/compatibility/NOTICE.txt
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-v4_intermediates/android-support-v4.jar    extras/android/compatibility/v4/android-support-v4.jar
+frameworks/support/v4                                                                             extras/android/compatibility/v4/src
+development/samples/Support4Demos                                                                 extras/android/compatibility/v4/samples/Support4Demos
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-v13_intermediates/android-support-v13.jar  extras/android/compatibility/v13/android-support-v13.jar
+frameworks/support/v13                                                                            extras/android/compatibility/v13/src
+development/samples/Support13Demos                                                                extras/android/compatibility/v13/samples/Support13Demos