diff options
author | Xin Li <delphij@google.com> | 2020-09-08 16:54:26 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2020-09-08 16:54:26 -0700 |
commit | ed44f0cbef36c1e6067d31d80b4372ad951b03e5 (patch) | |
tree | c4a7d03d044f6c95bcb19780adda0bf3d57ed7b6 | |
parent | 69e476290ceb1a490635253a6c406ca04077e731 (diff) | |
parent | 58f1f69a0ed6978af5e93eaa76af24dcca17772f (diff) | |
download | arvo-ed44f0cbef36c1e6067d31d80b4372ad951b03e5.tar.gz |
Merge Android R
Bug: 168057903
Merged-In: Idbf8064b452046180970762ee90d6539336fd54a
Change-Id: I02e77b1f0125769eac1a34b00261633b8014e5bf
-rw-r--r-- | Android.bp | 33 | ||||
-rw-r--r-- | Android.mk | 54 |
2 files changed, 33 insertions, 54 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..b18cc6d --- /dev/null +++ b/Android.bp @@ -0,0 +1,33 @@ +// 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: "Arvo-Regular.ttf", + src: "Arvo-Regular.ttf", +} + +prebuilt_font { + name: "Arvo-Italic.ttf", + src: "Arvo-Italic.ttf", +} + +prebuilt_font { + name: "Arvo-Bold.ttf", + src: "Arvo-Bold.ttf", +} + +prebuilt_font { + name: "Arvo-BoldItalic.ttf", + src: "Arvo-BoldItalic.ttf", +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 4fdd5b6..0000000 --- a/Android.mk +++ /dev/null @@ -1,54 +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 := Arvo-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 := Arvo-Italic.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 := Arvo-Bold.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 := Arvo-BoldItalic.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT) - -endif |