From 9580c7653aaee50ec70298dd8160269d6b14c199 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Fri, 23 Sep 2011 14:09:17 -0700
Subject: Get the NOTICE installed together with the font itself.

Change-Id: I54f30d248757c7945ab00010319b7be64b621e3a
---
 Android.mk | 27 +++++++++++++++++++++++++++
 fonts.mk   | 36 ++++++++++++++++++------------------
 2 files changed, 45 insertions(+), 18 deletions(-)
 create mode 100644 Android.mk

diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..bc0d7c7
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,27 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# We have to use BUILD_PREBUILT instead of PRODUCT_COPY_FIES,
+# to copy over the NOTICE file.
+
+LOCAL_PATH := $(call my-dir)
+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
+
+include $(BUILD_PREBUILT)
diff --git a/fonts.mk b/fonts.mk
index 438a7fe..c0c882b 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -1,20 +1,20 @@
-# Include these fonts on all devices
-PRODUCT_COPY_FILES += \
-    external/lohit-fonts/lohit-devanagari-ttf/Lohit-Devanagari.ttf:system/fonts/Lohit-Devanagari.ttf
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-# Use SMALLER_FONT_FOOTPRINT to restrict font availability on constrained devices:
-## 
-## Next, include additional fonts, depending on how much space we have
-#ifeq ($(SMALLER_FONT_FOOTPRINT),true)
-## Smaller fonts alternatives
-#PRODUCT_COPY_FILES += \
-#    frameworks/base/data/fonts/DroidSansFallback.ttf:system/fonts/DroidSansFallback.ttf
-#else
-## Full font set alternatives
-#PRODUCT_COPY_FILES += \
-#    frameworks/base/data/fonts/DroidSansFallbackFull.ttf:system/fonts/DroidSansFallback.ttf \
-#    frameworks/base/data/fonts/DroidSans.ttf:system/fonts/DroidSans.ttf \
-#    frameworks/base/data/fonts/DroidSans-Bold.ttf:system/fonts/DroidSans-Bold.ttf \
-#    frameworks/base/data/fonts/DroidSansEthiopic-Regular.ttf:system/fonts/DroidSansEthiopic-Regular.ttf
-#endif
+# We have to use PRODUCT_PACKAGES (together with BUILD_PREBUILT) instead of
+# PRODUCT_COPY_FILES to install the font files, so that the NOTICE file can
+# get installed too.
 
+PRODUCT_PACKAGES := \
+    Lohit-Devanagari.ttf
-- 
cgit v1.2.3