From 6180e5b8fd17b30d75f3f02a482c993fa04db0f0 Mon Sep 17 00:00:00 2001
From: Kris Giesing <kgiesing@google.com>
Date: Thu, 26 Mar 2015 15:37:46 -0700
Subject: Allow override of Motoya with full NotoSans

b/17599829

Change-Id: I619288eadb8bf814b08dca833f540a80e38c2123
---
 data/fonts/Android.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'data')

diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 38321a3..a0b26f3 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -49,6 +49,8 @@ extra_font_files := \
 ################################
 # Do not include Motoya on space-constrained devices
 ifneq ($(SMALLER_FONT_FOOTPRINT),true)
+# Do not include Motoya if we are including full NotoSans
+ifneq ($(FONT_NOTOSANS_FULL),true)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := MTLmr3m.ttf
@@ -59,6 +61,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
 include $(BUILD_PREBUILT)
 extra_font_files += MTLmr3m.ttf
 
+endif  # !FONT_NOTOSANS_FULL
 endif  # !SMALLER_FONT_FOOTPRINT
 
 ################################
-- 
cgit v1.1