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

Commit c9925480 authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by Android (Google) Code Review
Browse files

Merge "Remove Droid Sans Fallback from all builds"

parents 27014354 aba60b54

data/fonts/Android.mk

+2 −17
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
# 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.

# because MINIMAL_FONT_FOOTPRINT is only available in Android.mks.



LOCAL_PATH := $(call my-dir)
@@ -58,21 +58,6 @@ LOCAL_REQUIRED_MODULES := $(extra_font_files) 
include $(BUILD_PREBUILT)

extra_font_files :=



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

# Include the DroidSansFallback subset on SMALLER_FONT_FOOTPRINT build

ifeq ($(SMALLER_FONT_FOOTPRINT),true)



include $(CLEAR_VARS)

LOCAL_MODULE := DroidSansFallback.ttf

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts

include $(BUILD_PREBUILT)

droidsans_fallback_src :=



endif  # SMALLER_FONT_FOOTPRINT



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

# Build the rest of font files as prebuilt.
@@ -101,7 +86,7 @@ font_src_files := 
checkbuild: fontchain_lint



FONTCHAIN_LINTER := frameworks/base/tools/fonts/fontchain_lint.py

ifeq ($(SMALLER_FONT_FOOTPRINT),true)

ifeq ($(MINIMAL_FONT_FOOTPRINT),true)

CHECK_EMOJI := false

else

CHECK_EMOJI := true

data/fonts/fonts.mk

+1 −2
Original line number Diff line number Diff line
@@ -18,6 +18,5 @@ PRODUCT_COPY_FILES := \ 
    frameworks/base/data/fonts/fonts.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/fonts.xml



PRODUCT_PACKAGES := \

    DroidSansFallback.ttf \

    DroidSansMono.ttf \

    AndroidClock.ttf \
 
    AndroidClock.ttf

data/fonts/fonts.xml

+0 −3
Original line number Diff line number Diff line
@@ -353,9 +353,6 @@ 
    <family lang="und-Zsym">

        <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted2.ttf</font>

    </family>

    <family>

        <font weight="400" style="normal">DroidSansFallback.ttf</font>

    </family>

    <!--

        Tai Le and Mongolian are intentionally kept last, to make sure they don't override

        the East Asian punctuation for Chinese.