Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46b20e7f authored by Ying Wang's avatar Ying Wang
Browse files

Correction the use of SMALLER_FONT_FOOTPRINT 

SMALLER_FONT_FOOTPRINT is a BoardConfig variable that's only available
in Android.mks but not product config makefiles.

Change-Id: I1784b6e8c744ffcca1538e76d338f5800f150e72
parent 2d56123b

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/Lohit_Hindi.ttf)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/DroidSans*)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

data/fonts/Android.mk

0 → 100644
+61 −0
Original line number Diff line number Diff line 
# Copyright (C) 2011 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.



# We have to use BUILD_PREBUILT instead of PRODUCT_COPY_FIES,

# because SMALLER_FONT_FOOTPRINT is only available in Android.mks.



LOCAL_PATH := $(call my-dir)



ifeq ($(SMALLER_FONT_FOOTPRINT),true)

droidsans_fallback_src := DroidSansFallback.ttf

extra_droidsans_fonts :=

else

droidsans_fallback_src := DroidSansFallbackFull.ttf

extra_droidsans_fonts := DroidSans.ttf DroidSans-Bold.ttf DroidSansEthiopic-Regular.ttf

endif



include $(CLEAR_VARS)

LOCAL_MODULE := DroidSansFallback.ttf

LOCAL_SRC_FILES := $(droidsans_fallback_src)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts

LOCAL_REQUIRED_MODULES := $(extra_droidsans_fonts)

droidsans_fallback_src :=

extra_droidsans_fonts :=

include $(BUILD_PREBUILT)



include $(CLEAR_VARS)

LOCAL_MODULE := DroidSans.ttf

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts

include $(BUILD_PREBUILT)



include $(CLEAR_VARS)

LOCAL_MODULE := DroidSans-Bold.ttf

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts

include $(BUILD_PREBUILT)



include $(CLEAR_VARS)

LOCAL_MODULE := DroidSansEthiopic-Regular.ttf

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts

include $(BUILD_PREBUILT)

data/fonts/fonts.mk

+4 −13
Original line number Diff line number Diff line
@@ -39,16 +39,7 @@ PRODUCT_COPY_FILES := \ 
    frameworks/base/data/fonts/system_fonts.xml:system/etc/system_fonts.xml \

    frameworks/base/data/fonts/fallback_fonts.xml:system/etc/fallback_fonts.xml



# Next, include additional fonts, depending on how much space we have

ifeq ($(SMALLER_FONT_FOOTPRINT),true)

# Smaller fonts alternatives

PRODUCT_COPY_FILES += \

    frameworks/base/data/fonts/DroidSansFallback.ttf:system/fonts/DroidSansFallback.ttf

else

# Full font set alternatives

PRODUCT_COPY_FILES += \

    frameworks/base/data/fonts/DroidSansFallbackFull.ttf:system/fonts/DroidSansFallback.ttf \

    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/DroidSansEthiopic-Regular.ttf:system/fonts/DroidSansEthiopic-Regular.ttf

endif
 
# Next, include additional fonts, depending on how much space we have.

# Details see module definitions in Android.mk.

PRODUCT_PACKAGES := \

    DroidSansFallback.ttf