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

Commit 52256205 authored by Roozbeh Pournader's avatar Roozbeh Pournader
Browse files

Merge EXTENDED font profile with the next (unnamed) profile. 

This is now possible since we have less space restrictions on
devices.

This helps make sure that devices don't mistakenly ship with a
limited font support simply because they didn't turn on the extended
font profile.

Although the larger version of Droid Sans Fallback is no longer used
in any font profile for a device, it is kept since it's used by the
SDK.

The Nanum Gothic font is no longer used in any device profile either,
but it's kept in the fallback chain, so the SDK (that uses it)
continues to work.

Bug: 19668057
Change-Id: I6e32c4c98745e9b6aff6684d993943a19aebf6f7
parent 98b40aac

data/fonts/Android.mk

+7 −14
Original line number Original line Diff line number Diff line
@@ -17,8 +17,8 @@ 




LOCAL_PATH := $(call my-dir)

LOCAL_PATH := $(call my-dir)





# Use full Noto Sans Japanese font on extended footprint

# Use full Noto Sans Japanese font on non-smaller footprints

ifeq ($(EXTENDED_FONT_FOOTPRINT),true)

ifneq ($(SMALLER_FONT_FOOTPRINT),true)

FONT_NOTOSANS_JP_FULL := true

FONT_NOTOSANS_JP_FULL := true

endif

endif
@@ -38,7 +38,7 @@ ALL_MODULES.$(1).INSTALLED := \ 
endef

endef





##########################################

##########################################

# The following fonts are distributed as symlink only.

# The following fonts are just symlinks, for backward compatibility.

##########################################

##########################################

$(eval $(call create-font-symlink,DroidSans.ttf,Roboto-Regular.ttf))

$(eval $(call create-font-symlink,DroidSans.ttf,Roboto-Regular.ttf))

$(eval $(call create-font-symlink,DroidSans-Bold.ttf,Roboto-Bold.ttf))

$(eval $(call create-font-symlink,DroidSans-Bold.ttf,Roboto-Bold.ttf))
@@ -54,7 +54,7 @@ extra_font_files := \ 
################################

################################

# Do not include Motoya on space-constrained devices

# Do not include Motoya on space-constrained devices

ifneq ($(SMALLER_FONT_FOOTPRINT),true)

ifneq ($(SMALLER_FONT_FOOTPRINT),true)

# Do not include Motoya if we are including full NotoSans

# Do not include Motoya if we are including Noto Sans Japanese

ifneq ($(FONT_NOTOSANS_JP_FULL),true)

ifneq ($(FONT_NOTOSANS_JP_FULL),true)





include $(CLEAR_VARS)

include $(CLEAR_VARS)
@@ -82,26 +82,19 @@ include $(BUILD_PREBUILT) 
extra_font_files :=

extra_font_files :=





################################

################################

# Include DroidSansFallback only on non-EXTENDED_FONT_FOOTPRINT builds

# Include the DroidSansFallback subset on SMALLER_FONT_FOOTPRINT build

ifneq ($(EXTENDED_FONT_FOOTPRINT),true)



# Include a subset of DroidSansFallback on SMALLER_FONT_FOOTPRINT build

ifeq ($(SMALLER_FONT_FOOTPRINT),true)

ifeq ($(SMALLER_FONT_FOOTPRINT),true)

droidsans_fallback_src := DroidSansFallback.ttf

else  # !SMALLER_FONT_FOOTPRINT

droidsans_fallback_src := DroidSansFallbackFull.ttf

endif  # SMALLER_FONT_FOOTPRINT





include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_MODULE := DroidSansFallback.ttf

LOCAL_MODULE := DroidSansFallback.ttf

LOCAL_SRC_FILES := $(droidsans_fallback_src)

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts

LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts

include $(BUILD_PREBUILT)

include $(BUILD_PREBUILT)

droidsans_fallback_src :=

droidsans_fallback_src :=





endif  # !EXTENDED_FONT_FOOTPRINT

endif  # SMALLER_FONT_FOOTPRINT





################################

################################

# Build the rest of font files as prebuilt.

# Build the rest of font files as prebuilt.