summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Arruda <patricearruda@google.com>2019-05-20 12:27:25 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-20 12:27:25 -0700
commit7e64efd1f1f8ee3d75ab2b9e2efdbb928d102456 (patch)
tree4ac3b7c9df2b8a94601372ea491d4b2f026aa43a
parent1a91de515c75522dbd90c92ec30b61754bc2e39f (diff)
parent77c56072ac50bd67de8a986f847506b6e8d5ce9a (diff)
downloaddancing-script-7e64efd1f1f8ee3d75ab2b9e2efdbb928d102456.tar.gz
Convert Android.mk to Android.bp.
am: 77c56072ac Change-Id: I58be82cb79ba651b50caf7caf9b6dee0f3ebd09c
-rw-r--r--Android.bp23
-rw-r--r--Android.mk38
2 files changed, 23 insertions, 38 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..12ed461
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,23 @@
+// 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: "DancingScript-Regular.ttf",
+ src: "DancingScript-Regular.ttf",
+}
+
+prebuilt_font {
+ name: "DancingScript-Bold.ttf",
+ src: "DancingScript-Bold.ttf",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 154a69c..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,38 +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.
-
-# 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 := DancingScript-Regular.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 := DancingScript-Bold.ttf
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
-include $(BUILD_PREBUILT)
-
-endif