summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-06-18 00:15:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-18 00:15:40 +0000
commitc91c719f91fe9b24c136469a34e848899e67b11f (patch)
treefb695761822bef6fe80300cd360152d9c4b0b2c3
parent6c9d1af8213394eb9458e71f2e6d62c4de716902 (diff)
parentdd2dac3659cad1594ce3a72f10b1216424b62441 (diff)
am dd2dac36: am edf631de: Package renamed fonts. [DO NOT MERGE]
* commit 'dd2dac3659cad1594ce3a72f10b1216424b62441': Package renamed fonts. [DO NOT MERGE]
-rw-r--r--build/sdk.atree3
1 files changed, 1 insertions, 2 deletions
diff --git a/build/sdk.atree b/build/sdk.atree
index a902551a2..d1000f369 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -169,8 +169,7 @@ docs/widgets.txt platforms/${PLATFORM_NAME}/data/widgets.txt
docs/features.txt platforms/${PLATFORM_NAME}/data/features.txt
# fonts for layoutlib.
-frameworks/base/data/fonts platforms/${PLATFORM_NAME}/data/fonts
-external/noto-fonts platforms/${PLATFORM_NAME}/data/fonts
+${FONT_OUT} platforms/${PLATFORM_NAME}/data/fonts
# NOTICE files are copied by build/core/Makefile from sdk.git
sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/templates/NOTICE.txt