LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 2f2fb96b: Make the SDK packaging put the samples in the root folder.

Browse Source 
Merge commit '2f2fb96b4b037a016336a98e3b637f4394e1f323' into eclair-plus-aosp

* commit '2f2fb96b4b037a016336a98e3b637f4394e1f323':
  Make the SDK packaging put the samples in the root folder.
This commit is contained in:
Xavier Ducrohet
2010-01-12 12:46:21 -08:00
committed by Android Git Automerger
parent 7b48a6463f 2f2fb96b4b
commit 7ae4c4026a
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
build/sdk.atree
View File

@@ -73,22 +73,23 @@ sdk/files/devices.xml tools/lib/devices.xml
sdk/files/android.el tools/lib/android.el sdk/files/android.el tools/lib/android.el
# samples # samples
development/apps/GestureBuilder platforms/${PLATFORM_NAME}/samples/GestureBuilder development/samples/source.properties samples/${PLATFORM_NAME}/source.properties
development/samples/BluetoothChat platforms/${PLATFORM_NAME}/samples/BluetoothChat development/apps/GestureBuilder samples/${PLATFORM_NAME}/GestureBuilder
development/samples/Home platforms/${PLATFORM_NAME}/samples/Home development/samples/BluetoothChat samples/${PLATFORM_NAME}/BluetoothChat
development/samples/LunarLander platforms/${PLATFORM_NAME}/samples/LunarLander development/samples/Home samples/${PLATFORM_NAME}/Home
development/samples/NotePad platforms/${PLATFORM_NAME}/samples/NotePad development/samples/LunarLander samples/${PLATFORM_NAME}/LunarLander
development/samples/ApiDemos platforms/${PLATFORM_NAME}/samples/ApiDemos development/samples/NotePad samples/${PLATFORM_NAME}/NotePad
development/samples/SkeletonApp platforms/${PLATFORM_NAME}/samples/SkeletonApp development/samples/ApiDemos samples/${PLATFORM_NAME}/ApiDemos
development/samples/Snake platforms/${PLATFORM_NAME}/samples/Snake development/samples/SkeletonApp samples/${PLATFORM_NAME}/SkeletonApp
development/samples/SoftKeyboard platforms/${PLATFORM_NAME}/samples/SoftKeyboard development/samples/Snake samples/${PLATFORM_NAME}/Snake
development/samples/JetBoy platforms/${PLATFORM_NAME}/samples/JetBoy development/samples/SoftKeyboard samples/${PLATFORM_NAME}/SoftKeyboard
development/samples/SearchableDictionary platforms/${PLATFORM_NAME}/samples/SearchableDictionary development/samples/JetBoy samples/${PLATFORM_NAME}/JetBoy
development/samples/ContactManager platforms/${PLATFORM_NAME}/samples/ContactManager development/samples/SearchableDictionary samples/${PLATFORM_NAME}/SearchableDictionary
development/samples/MultiResolution platforms/${PLATFORM_NAME}/samples/MultiResolution development/samples/ContactManager samples/${PLATFORM_NAME}/ContactManager
development/samples/Wiktionary platforms/${PLATFORM_NAME}/samples/Wiktionary development/samples/MultiResolution samples/${PLATFORM_NAME}/MultiResolution
development/samples/WiktionarySimple platforms/${PLATFORM_NAME}/samples/WiktionarySimple development/samples/Wiktionary samples/${PLATFORM_NAME}/Wiktionary
development/samples/CubeLiveWallpaper platforms/${PLATFORM_NAME}/samples/CubeLiveWallpaper development/samples/WiktionarySimple samples/${PLATFORM_NAME}/WiktionarySimple
development/samples/CubeLiveWallpaper samples/${PLATFORM_NAME}/CubeLiveWallpaper
# dx # dx
bin/dx platforms/${PLATFORM_NAME}/tools/dx bin/dx platforms/${PLATFORM_NAME}/tools/dx
@@ -177,10 +178,10 @@ sdk/emulator/skins/WVGA854 platforms/${PLATFORM_NAME}/skins/WVGA854
# NOTICE files are copied by build/core/Makefile from sdk.git # NOTICE files are copied by build/core/Makefile from sdk.git
sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/templates/NOTICE.txt sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/templates/NOTICE.txt
sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/samples/NOTICE.txt
sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/data/NOTICE.txt sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/data/NOTICE.txt
sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/skins/NOTICE.txt sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/skins/NOTICE.txt
sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/tools/NOTICE.txt sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/tools/NOTICE.txt
sdk/files/sdk_files_NOTICE.txt samples/${PLATFORM_NAME}/NOTICE.txt
# the readme # the readme
development/docs/SDK_RELEASE_NOTES RELEASE_NOTES.html development/docs/SDK_RELEASE_NOTES RELEASE_NOTES.html

5
samples/source.properties Normal file
View File

@@ -0,0 +1,5 @@
Pkg.UserSrc=false
Platform.Version=2.1
Pkg.Revision=1
AndroidVersion.ApiLevel=7