diff options
author | Patrice Arruda <patricearruda@google.com> | 2019-05-20 16:22:24 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-20 16:22:24 -0700 |
commit | c2ee745ad605df8e37a181bce60350113228d091 (patch) | |
tree | 4ac3b7c9df2b8a94601372ea491d4b2f026aa43a | |
parent | 23b7015fb197f99ab9833b4dd29ada3886fede6d (diff) | |
parent | 3d79d9f7683a7e0a59f84c191cfb22c447e546e3 (diff) | |
download | dancing-script-c2ee745ad605df8e37a181bce60350113228d091.tar.gz |
Convert Android.mk to Android.bp. am: 77c56072ac am: 7e64efd1f1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-release
am: 3d79d9f768
Change-Id: Ie4aa3b94e824db6f1f72318e252423d9d0435e30
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | Android.mk | 38 |
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 |