Snap for 6439596 from 344f772c902ad9f1097f74ee86540e13e6a0a047 to qt-aml-tzdata-release
Change-Id: Ifecc6eee36279a5604baa58ae63dd4fc1c225462
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index e1d62df..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (C) 2014 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.
-
-prebuilt_font {
- name: "CarroisGothicSC-Regular.ttf",
- src: "CarroisGothicSC-Regular.ttf",
-}
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..6f7918f
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,30 @@
+# Copyright (C) 2014 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)
+
+ifneq ($(SMALLER_FONT_FOOTPRINT),true)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CarroisGothicSC-Regular.ttf
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
+include $(BUILD_PREBUILT)
+
+endif