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

Commit 276c4eb0 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Convert much of f/b/data/fonts/Android.mk to Android.bp 

The Serif symlinks haven't been used since 2014, so I removed them.

Test: treehugger
Test: m fonts.xml DroidSansMono.ttf AndroidClock.ttf, ensure same installed files
Change-Id: I496498e0debac37f5fff4b9e046813e6b2694fd5
parent a6338544

data/fonts/Android.bp

0 → 100644
+36 −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.



prebuilt_font {

    name: "DroidSansMono.ttf",

    src: "DroidSansMono.ttf",

    required: [

        "DroidSans.ttf",

        "DroidSans-Bold.ttf",

    ],

}



prebuilt_font {

    name: "AndroidClock.ttf",

    src: "AndroidClock.ttf",

}



/////////////////////////////////

// Copies the font configuration file into system/etc for the product as fonts.xml.

// Additional fonts should be installed to /product/fonts/ alongside a corresponding

// fonts_customiztion.xml in /product/etc/

prebuilt_etc {

    name: "fonts.xml",

    src: "fonts.xml",

}

data/fonts/Android.mk

+0 −57
Original line number Diff line number Diff line
@@ -12,9 +12,6 @@ 
# 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 MINIMAL_FONT_FOOTPRINT is only available in Android.mks.



LOCAL_PATH := $(call my-dir)



##########################################
@@ -37,61 +34,7 @@ endef 
##########################################

$(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,DroidSerif-Regular.ttf,NotoSerif-Regular.ttf))

$(eval $(call create-font-symlink,DroidSerif-Bold.ttf,NotoSerif-Bold.ttf))

$(eval $(call create-font-symlink,DroidSerif-Italic.ttf,NotoSerif-Italic.ttf))

$(eval $(call create-font-symlink,DroidSerif-BoldItalic.ttf,NotoSerif-BoldItalic.ttf))



extra_font_files := \

    DroidSans.ttf \

    DroidSans-Bold.ttf



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

# Use DroidSansMono to hang extra_font_files on

include $(CLEAR_VARS)

LOCAL_MODULE := DroidSansMono.ttf

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts

LOCAL_REQUIRED_MODULES := $(extra_font_files)

include $(BUILD_PREBUILT)

extra_font_files :=



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

# Build the rest of font files as prebuilt.



# $(1): The source file name in LOCAL_PATH.

#       It also serves as the module name and the dest file name.

define build-one-font-module

$(eval include $(CLEAR_VARS))\

$(eval LOCAL_MODULE := $(1))\

$(eval LOCAL_SRC_FILES := $(1))\

$(eval LOCAL_MODULE_CLASS := ETC)\

$(eval LOCAL_MODULE_TAGS := optional)\

$(eval LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts)\

$(eval include $(BUILD_PREBUILT))

endef



font_src_files := \

    AndroidClock.ttf



$(foreach f, $(font_src_files), $(call build-one-font-module, $(f)))



build-one-font-module :=

font_src_files :=



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

# Copies the font configuration file into system/etc for the product as fonts.xml.

# Additional fonts should be installed to /product/fonts/ alongside a corresponding

# fonts_customiztion.xml in /product/etc/

include $(CLEAR_VARS)



LOCAL_MODULE := fonts.xml

LOCAL_MODULE_CLASS := ETC

LOCAL_PREBUILT_MODULE_FILE := frameworks/base/data/fonts/fonts.xml



include $(BUILD_PREBUILT)



# Run sanity tests on fonts on checkbuild

checkbuild: fontchain_lint