commit ca94ba950b5b3fc19aeed55742ac3dbc94ba6c94
author android-build-team Robot <android-build-team-robot@google.com> Thu Apr 04 03:05:58 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Apr 04 03:05:58 2019 +0000
tree a78e6ccfd42801a1f86ec983462b8a3953888e46
parent 02fc784a188fa65060c7633abc4227841161b001
parent 139c627f77933688eeda9c16a575c1421af08808

Snap for 5434517 from 139c627f77933688eeda9c16a575c1421af08808 to qt-release

Change-Id: I3e8fbf9bfe26dfee6042a956b28477c4acd43fe3

Android.mk

diff --git a/Android.mk b/Android.mk
index e95a443..b91df80 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,51 +20,32 @@
 ifneq ($(SMALLER_FONT_FOOTPRINT),true)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := Lato-Regular.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 := Lato-Italic.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
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := Lato-Medium.ttf
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
-include $(BUILD_PREBUILT)
+font_src_files := \
+    Lato-Regular.ttf \
+    Lato-Italic.ttf \
+    Lato-Medium.ttf \
+    Lato-MediumItalic.ttf \
+    Lato-Bold.ttf \
+    Lato-BoldItalic.ttf
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := Lato-MediumItalic.ttf
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
-include $(BUILD_PREBUILT)
+$(foreach f, $(font_src_files), $(call build-one-font-module, $(f)))
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := Lato-Bold.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 := Lato-BoldItalic.ttf
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
-include $(BUILD_PREBUILT)
+build-one-font-module :=
+font_src_files :=
 
 endif