diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-28 20:22:41 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-28 20:22:41 +0000 |
| commit | cc40399634278382fc0eae3a80f60b0dda845b7b (patch) | |
| tree | 66a3570c32cec1ec8abc5adb201133f7b6d6ec6b | |
| parent | 8c54a6b341ce312cb1ef44add56b5fb0183aaf69 (diff) | |
| parent | 344f772c902ad9f1097f74ee86540e13e6a0a047 (diff) | |
| download | carrois-gothic-sc-q_tzdata_aml_297100000.tar.gz | |
Snap for 6439596 from 344f772c902ad9f1097f74ee86540e13e6a0a047 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release
Change-Id: Ifecc6eee36279a5604baa58ae63dd4fc1c225462
| -rw-r--r-- | Android.bp | 18 | ||||
| -rw-r--r-- | Android.mk | 30 |
2 files changed, 30 insertions, 18 deletions
diff --git a/Android.bp b/Android.bp deleted file mode 100644 index e1d62df..0000000 --- a/Android.bp +++ /dev/null @@ -1,18 +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. - -prebuilt_font { - name: "CarroisGothicSC-Regular.ttf", - src: "CarroisGothicSC-Regular.ttf", -} diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..6f7918f --- /dev/null +++ b/Android.mk @@ -0,0 +1,30 @@ +# 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 := CarroisGothicSC-Regular.ttf +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts +include $(BUILD_PREBUILT) + +endif |