summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Rassieur <rassb@google.com>2019-04-02 18:29:56 +0000
committerBill Rassieur <rassb@google.com>2019-04-02 18:29:56 +0000
commit6392419245b84e660272f8068b24ffa938cd702c (patch)
tree6fbb878feabe80f42cacefdd824d703867cc7670
parentc4ee530cc35767ae00796fbf94c712b6e237f35c (diff)
parent6187e3972ac7a6aa8e7a79078e7e790b24289e96 (diff)
downloadzilla-slab-6392419245b84e660272f8068b24ffa938cd702c.tar.gz
Merge master@5428150 into git_qt-dev-plus-aosp.
Change-Id: I060913901099ff46e65cea2af8bdcc953d7cceb7 BUG: 129345239
-rw-r--r--Android.mk55
1 files changed, 24 insertions, 31 deletions
diff --git a/Android.mk b/Android.mk
index 94f770a..4152b8c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,36 +19,29 @@ LOCAL_PATH := $(call my-dir)
ifneq ($(SMALLER_FONT_FOOTPRINT),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := ZillaSlab-Medium.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 := ZillaSlab-MediumItalic.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 := ZillaSlab-SemiBold.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 := ZillaSlab-SemiBoldItalic.ttf
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
-include $(BUILD_PREBUILT)
+# 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_PRODUCT)/fonts)\
+$(eval LOCAL_PRODUCT_MODULE := true) \
+$(eval include $(BUILD_PREBUILT))
+endef
+
+font_src_files := \
+ ZillaSlab-Medium.ttf \
+ ZillaSlab-MediumItalic.ttf \
+ ZillaSlab-SemiBold.ttf \
+ ZillaSlab-SemiBoldItalic.ttf
+
+$(foreach f, $(font_src_files), $(call build-one-font-module, $(f)))
+
+build-one-font-module :=
+font_src_files :=
endif