diff options
| author | Xin Li <delphij@google.com> | 2020-08-27 10:16:25 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-08-27 10:16:25 -0700 |
| commit | f7b16556de01e2948d0dce6d1456cb95507476bf (patch) | |
| tree | ca71dc3ad36958e5ba2b125f45fb29b0e74e5b1c | |
| parent | a4585df413033fd56cc9d1be870441f51be3bf60 (diff) | |
| parent | 5025278686078e2552248ff5413f8eabf0d3a8a0 (diff) | |
| download | arbutus-slab-f7b16556de01e2948d0dce6d1456cb95507476bf.tar.gz | |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507
Merged-In: I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480
Change-Id: I748f0c03addce78910b67d3e2a1ee2df633d1595
| -rw-r--r-- | Android.bp | 19 | ||||
| -rw-r--r-- | Android.mk | 32 |
2 files changed, 19 insertions, 32 deletions
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 |