From 56f8c2b355dac989e21e748e71739e0a2defa9a6 Mon Sep 17 00:00:00 2001 From: Patrice Arruda Date: Thu, 16 May 2019 10:39:15 -0700 Subject: Convert Android.mk to Android.bp. See build/soong/README.md for more information. Fixes: b/122331951 Test: Built and checked if the font were installed in the correct location. Change-Id: I433d8814ae93d475e9880fa4c0b87b09b4097d5f --- Android.bp | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Android.mk | 97 ----------------------------------------------------------- 2 files changed, 100 insertions(+), 97 deletions(-) delete mode 100644 Android.mk diff --git a/Android.bp b/Android.bp index b56efbb..f613462 100644 --- a/Android.bp +++ b/Android.bp @@ -21,3 +21,103 @@ filegroup { "*.ttf", ], } + +prebuilt_font { + name: "Roboto-Regular.ttf", + src: "Roboto-Regular.ttf", +} + +prebuilt_font { + name: "Roboto-Bold.ttf", + src: "Roboto-Bold.ttf", +} + +prebuilt_font { + name: "Roboto-Italic.ttf", + src: "Roboto-Italic.ttf", +} + +prebuilt_font { + name: "Roboto-BoldItalic.ttf", + src: "Roboto-BoldItalic.ttf", +} + +prebuilt_font { + name: "Roboto-Black.ttf", + src: "Roboto-Black.ttf", +} + +prebuilt_font { + name: "Roboto-BlackItalic.ttf", + src: "Roboto-BlackItalic.ttf", +} + +prebuilt_font { + name: "Roboto-Light.ttf", + src: "Roboto-Light.ttf", +} + +prebuilt_font { + name: "Roboto-LightItalic.ttf", + src: "Roboto-LightItalic.ttf", +} + +prebuilt_font { + name: "Roboto-Medium.ttf", + src: "Roboto-Medium.ttf", +} + +prebuilt_font { + name: "Roboto-MediumItalic.ttf", + src: "Roboto-MediumItalic.ttf", +} + +prebuilt_font { + name: "Roboto-Thin.ttf", + src: "Roboto-Thin.ttf", +} + +prebuilt_font { + name: "Roboto-ThinItalic.ttf", + src: "Roboto-ThinItalic.ttf", +} + +prebuilt_font { + name: "RobotoCondensed-Regular.ttf", + src: "RobotoCondensed-Regular.ttf", +} + +prebuilt_font { + name: "RobotoCondensed-Bold.ttf", + src: "RobotoCondensed-Bold.ttf", +} + +prebuilt_font { + name: "RobotoCondensed-Italic.ttf", + src: "RobotoCondensed-Italic.ttf", +} + +prebuilt_font { + name: "RobotoCondensed-BoldItalic.ttf", + src: "RobotoCondensed-BoldItalic.ttf", +} + +prebuilt_font { + name: "RobotoCondensed-Light.ttf", + src: "RobotoCondensed-Light.ttf", +} + +prebuilt_font { + name: "RobotoCondensed-LightItalic.ttf", + src: "RobotoCondensed-LightItalic.ttf", +} + +prebuilt_font { + name: "RobotoCondensed-Medium.ttf", + src: "RobotoCondensed-Medium.ttf", +} + +prebuilt_font { + name: "RobotoCondensed-MediumItalic.ttf", + src: "RobotoCondensed-MediumItalic.ttf", +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 8094048..0000000 --- a/Android.mk +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright (C) 2015 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 MINIMAL_FONT_FOOTPRINT is only available in Android.mks. - -LOCAL_PATH := $(call my-dir) - -########################################## -# create symlink for given font -# $(1): new font $(2): link target -# should be used with eval: $(eval $(call ...)) -define create-font-symlink -$(PRODUCT_OUT)/system/fonts/$(1) : $(PRODUCT_OUT)/system/fonts/$(2) - @echo "Symlink: $$@ -> $$<" - @mkdir -p $$(dir $$@) - @rm -rf $$@ - $(hide) ln -sf $$(notdir $$<) $$@ -# this magic makes LOCAL_REQUIRED_MODULES work -ALL_MODULES.$(1).INSTALLED := \ - $(ALL_MODULES.$(1).INSTALLED) $(PRODUCT_OUT)/system/fonts/$(1) -endef - -# 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 := \ - Roboto-Regular.ttf \ - Roboto-Bold.ttf \ - Roboto-Italic.ttf \ - Roboto-BoldItalic.ttf - -ifeq ($(MINIMAL_FONT_FOOTPRINT),true) - -$(eval $(call create-font-symlink,Roboto-Black.ttf,Roboto-Bold.ttf)) -$(eval $(call create-font-symlink,Roboto-BlackItalic.ttf,Roboto-BoldItalic.ttf)) -$(eval $(call create-font-symlink,Roboto-Light.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,Roboto-LightItalic.ttf,Roboto-Italic.ttf)) -$(eval $(call create-font-symlink,Roboto-Medium.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,Roboto-MediumItalic.ttf,Roboto-Italic.ttf)) -$(eval $(call create-font-symlink,Roboto-Thin.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,Roboto-ThinItalic.ttf,Roboto-Italic.ttf)) -$(eval $(call create-font-symlink,RobotoCondensed-Regular.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,RobotoCondensed-Bold.ttf,Roboto-Bold.ttf)) -$(eval $(call create-font-symlink,RobotoCondensed-Italic.ttf,Roboto-Italic.ttf)) -$(eval $(call create-font-symlink,RobotoCondensed-BoldItalic.ttf,Roboto-BoldItalic.ttf)) -$(eval $(call create-font-symlink,RobotoCondensed-Light.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,RobotoCondensed-LightItalic.ttf,Roboto-Italic.ttf)) -$(eval $(call create-font-symlink,RobotoCondensed-Medium.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,RobotoCondensed-MediumItalic.ttf,Roboto-Italic.ttf)) - -else # !MINIMAL_FONT -font_src_files += \ - Roboto-Black.ttf \ - Roboto-BlackItalic.ttf \ - Roboto-Light.ttf \ - Roboto-LightItalic.ttf \ - Roboto-Medium.ttf \ - Roboto-MediumItalic.ttf \ - Roboto-Thin.ttf \ - Roboto-ThinItalic.ttf \ - RobotoCondensed-Regular.ttf \ - RobotoCondensed-Bold.ttf \ - RobotoCondensed-Italic.ttf \ - RobotoCondensed-BoldItalic.ttf \ - RobotoCondensed-Light.ttf \ - RobotoCondensed-LightItalic.ttf \ - RobotoCondensed-Medium.ttf \ - RobotoCondensed-MediumItalic.ttf - -endif # !MINIMAL_FONT - -$(foreach f, $(font_src_files), $(call build-one-font-module, $(f))) - -build-one-font-module := -font_src_files := -- cgit v1.2.3