Move the use of SMALLER_FONT_FOOTPRINT to Android.mkandroid-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-release

Bug:5393366
SMALLER_FONT_FOOTPRINT is a BoardConfig var. It can only be used in
Android.mk but not product config file.

Change-Id: If22a1f1d6a019aa36d1008a0314aca16e6a5db7f

2 files changed, 7 insertions, 10 deletions

diff --git a/Android.mk b/Android.mk
index 3cf4bb5..0954b43 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,12 +17,19 @@
 
 LOCAL_PATH := $(call my-dir)
 
+extra_lohit_fonts :=
+ifneq ($(SMALLER_FONT_FOOTPRINT),true)
+extra_lohit_fonts := Lohit-Bengali.ttf Lohit-Tamil.ttf
+endif
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := Lohit-Devanagari.ttf
 LOCAL_SRC_FILES := lohit-devanagari-ttf/$(LOCAL_MODULE)
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
+LOCAL_REQUIRED_MODULES := $(extra_lohit_fonts)
+extra_lohit_fonts :=
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
diff --git a/fonts.mk b/fonts.mk
index 86e5d23..c0c882b 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -16,15 +16,5 @@
 # PRODUCT_COPY_FILES to install the font files, so that the NOTICE file can
 # get installed too.
 
-
-ifeq ($(SMALLER_FONT_FOOTPRINT),true)
-# Smaller fonts alternatives
 PRODUCT_PACKAGES := \
     Lohit-Devanagari.ttf
-else
-## Full font set alternatives
-#PRODUCT_PACKAGES := \
-#    Lohit-Devanagari.ttf \
-#    Lohit-Bengali.ttf \
-#    Lohit-Tamil.ttf
-endif