diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-02-27 21:52:27 -0500 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-02-27 21:52:27 -0500 |
| commit | e02c8c9ae1f6801a847b1d079f710a3886b90eeb (patch) | |
| tree | 7024a60dcc4ae9b10e33ee0828f155f3485c972f | |
| parent | 105a060b8fe6e50fdbe184b8ddaab99560383214 (diff) | |
| parent | 5926db1a9546fff0716c8468c6a09cd82f21af0a (diff) | |
| download | android_development-e02c8c9ae1f6801a847b1d079f710a3886b90eeb.tar.gz android_development-e02c8c9ae1f6801a847b1d079f710a3886b90eeb.tar.bz2 android_development-e02c8c9ae1f6801a847b1d079f710a3886b90eeb.zip | |
Merge branch 'donut' of git://android.git.kernel.org/platform/development into HEAD
| -rw-r--r-- | build/sdk.atree | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/build/sdk.atree b/build/sdk.atree index 16d65de16..a5a0990dc 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -59,6 +59,7 @@ development/tools/scripts/java_tests_file.template platforms/${PLATFORM_NAME}/te development/tools/scripts/layout.template platforms/${PLATFORM_NAME}/templates/layout.template development/tools/scripts/strings.template platforms/${PLATFORM_NAME}/templates/strings.template development/tools/scripts/android_rules.xml platforms/${PLATFORM_NAME}/templates/android_rules.xml +development/tools/scripts/android_test_rules.xml platforms/${PLATFORM_NAME}/templates/android_test_rules.xml development/tools/scripts/build.template tools/lib/build.template # emacs support @@ -171,16 +172,21 @@ docs/service_actions.txt platforms/${PLATFORM_NAME}/data/service_actions.txt docs/categories.txt platforms/${PLATFORM_NAME}/data/categories.txt docs/widgets.txt platforms/${PLATFORM_NAME}/data/widgets.txt framework/layoutlib.jar platforms/${PLATFORM_NAME}/data/layoutlib.jar + +# framework resources for layoutlib frameworks/base/core/res/res platforms/${PLATFORM_NAME}/data/res -frameworks/base/data/fonts/fonts.xml platforms/${PLATFORM_NAME}/data/fonts/fonts.xml -frameworks/base/data/fonts/DroidSans.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSans.ttf -frameworks/base/data/fonts/DroidSans-Bold.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSans-Bold.ttf -frameworks/base/data/fonts/DroidSansFallback.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSansFallback.ttf -frameworks/base/data/fonts/DroidSansMono.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSansMono.ttf -frameworks/base/data/fonts/DroidSerif-Bold.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSerif-Bold.ttf + +# fonts for layoutlib. +frameworks/base/data/fonts/fonts.xml platforms/${PLATFORM_NAME}/data/fonts/fonts.xml +frameworks/base/data/fonts/DroidSans.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSans.ttf +frameworks/base/data/fonts/DroidSans-Bold.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSans-Bold.ttf +frameworks/base/data/fonts/DroidSansMono.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSansMono.ttf +frameworks/base/data/fonts/DroidSerif-Bold.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSerif-Bold.ttf frameworks/base/data/fonts/DroidSerif-BoldItalic.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSerif-BoldItalic.ttf -frameworks/base/data/fonts/DroidSerif-Italic.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSerif-Italic.ttf -frameworks/base/data/fonts/DroidSerif-Regular.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSerif-Regular.ttf +frameworks/base/data/fonts/DroidSerif-Italic.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSerif-Italic.ttf +frameworks/base/data/fonts/DroidSerif-Regular.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSerif-Regular.ttf +frameworks/base/data/fonts/DroidSansFallback.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSansFallback.ttf +frameworks/base/data/fonts/DroidSansJapanese.ttf platforms/${PLATFORM_NAME}/data/fonts/DroidSansJapanese.ttf # empty add-on folder with just a readme development/tools/scripts/README_add-ons.txt add-ons/README.txt |