diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-14 11:34:55 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-09-14 11:34:55 -0700 |
| commit | 84d36a657d7954dc08f3ef9f057ff2526036e817 (patch) | |
| tree | a89fe33f0121a25d077b3bd400a25940fb8e1077 /data | |
| parent | ac0b599fa7a72a6a529e8bde0463e6151694b2f7 (diff) | |
| download | frameworks_base-84d36a657d7954dc08f3ef9f057ff2526036e817.zip frameworks_base-84d36a657d7954dc08f3ef9f057ff2526036e817.tar.gz frameworks_base-84d36a657d7954dc08f3ef9f057ff2526036e817.tar.bz2 | |
Manage fonts like a true product definition
Change-Id: I9635f087d69dd302e3c313073a537a8ed283bb68
Diffstat (limited to 'data')
| -rw-r--r-- | data/fonts/Android.mk | 39 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 29 |
2 files changed, 29 insertions, 39 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk deleted file mode 100644 index 4c40646..0000000 --- a/data/fonts/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2008 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -copy_from := \ - DroidSans.ttf \ - DroidSans-Bold.ttf \ - DroidSansArabic.ttf \ - DroidSansHebrew.ttf \ - DroidSansThai.ttf \ - DroidSerif-Regular.ttf \ - DroidSerif-Bold.ttf \ - DroidSerif-Italic.ttf \ - DroidSerif-BoldItalic.ttf \ - DroidSansMono.ttf \ - Clockopia.ttf - -ifneq ($(NO_FALLBACK_FONT),true) -ifeq ($(filter %system/fonts/DroidSansFallback.ttf,$(PRODUCT_COPY_FILES)),) - # if the product makefile has set the the fallback font, don't override it. - copy_from += DroidSansFallback.ttf -endif -endif - -copy_file_pairs := $(foreach cf,$(copy_from),$(LOCAL_PATH)/$(cf):system/fonts/$(cf)) -PRODUCT_COPY_FILES += $(copy_file_pairs) diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk new file mode 100644 index 0000000..a6a70ea --- /dev/null +++ b/data/fonts/fonts.mk @@ -0,0 +1,29 @@ +# Copyright (C) 2008 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Warning: this is actually a product definition, to be inherited from + +PRODUCT_COPY_FILES := \ + frameworks/base/data/fonts/DroidSans.ttf:system/fonts/DroidSans.ttf \ + frameworks/base/data/fonts/DroidSans-Bold.ttf:system/fonts/DroidSans-Bold.ttf \ + frameworks/base/data/fonts/DroidSansArabic.ttf:DroidSansArabic.ttf \ + frameworks/base/data/fonts/DroidSansHebrew.ttf:system/fonts/DroidSansHebrew.ttf \ + frameworks/base/data/fonts/DroidSansThai.ttf:system/fonts/DroidSansThai.ttf \ + frameworks/base/data/fonts/DroidSerif-Regular.ttf:system/fonts/DroidSerif-Regular.ttf \ + frameworks/base/data/fonts/DroidSerif-Bold.ttf:system/fonts/DroidSerif-Bold.ttf \ + frameworks/base/data/fonts/DroidSerif-Italic.ttf:system/fonts/DroidSerif-Italic.ttf \ + frameworks/base/data/fonts/DroidSerif-BoldItalic.ttf:system/fonts/DroidSerif-BoldItalic.ttf \ + frameworks/base/data/fonts/DroidSansMono.ttf:system/fonts/DroidSansMono.ttf \ + frameworks/base/data/fonts/Clockopia.ttf:system/fonts/Clockopia.ttf \ + frameworks/base/data/fonts/DroidSansFallback.ttf:system/fonts/DroidSansFallback.ttf |