From 573b99d69f31c4d485810b6ffca82657676bf269 Mon Sep 17 00:00:00 2001 From: Patrice Arruda Date: Fri, 17 May 2019 17:39:14 -0700 Subject: Convert Android.mk to Android.bp. See build/soong/README.md for more information. Fixes: b/133011216 Test: Built and checked if the fonts were installed in the correct location in the system image. Change-Id: Iead1f630ebf9205def351f5dcbde41f03a3548ae --- Android.bp | 19 +++++++++++++++++++ Android.mk | 32 -------------------------------- 2 files changed, 19 insertions(+), 32 deletions(-) create mode 100644 Android.bp delete mode 100644 Android.mk diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..a19761b --- /dev/null +++ b/Android.bp @@ -0,0 +1,19 @@ +// Copyright (C) 2018 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: "ArbutusSlab-Regular.ttf", + src: "ArbutusSlab-Regular.ttf", + product_specific: true, +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 6e67855..0000000 --- a/Android.mk +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2018 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 := ArbutusSlab-Regular.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/fonts -LOCAL_PRODUCT_MODULE := true - -include $(BUILD_PREBUILT) - -endif -- cgit v1.2.3