commit 4a650db6c054b9b328eb1364d217a82296143d25
author Amin Shaikh <ashaikh@google.com> Tue Apr 02 17:18:21 2019 -0400
committer Amin Shaikh <ashaikh@google.com> Tue Apr 02 17:18:21 2019 -0400
tree ffef07cb3f9742aa68fab5d6a43de16f80bfccc6
parent 24c95305e590f8404b671d7b6b6715642eea06ea

Move Rubik to product partition.

Bug: 123701811
Test: make
Change-Id: I3776bc0916d25803fc2321377dc8dd73753ad98f

Android.mk

diff --git a/Android.mk b/Android.mk
index e7db9b8..b3c7fb8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,51 +20,31 @@
 ifneq ($(SMALLER_FONT_FOOTPRINT),true)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := Rubik-Regular.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 := Rubik-Italic.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 := \
+    Rubik-Regular.ttf \
+    Rubik-Italic.ttf \
+    Rubik-Medium.ttf \
+    Rubik-MediumItalic.ttf \
+    Rubik-Bold.ttf \
+    Rubik-BoldItalic.ttf
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := Rubik-Medium.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 := Rubik-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 := Rubik-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 := Rubik-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