diff options
| author | Patrice Arruda <patricearruda@google.com> | 2019-05-13 16:47:53 -0700 |
|---|---|---|
| committer | Patrice Arruda <patricearruda@google.com> | 2019-05-17 11:12:40 -0700 |
| commit | a2e0fa8fa4e6eeb77658deee5d5f6e447d289509 (patch) | |
| tree | f8311fa58b7a50e31b99f0e6c1b1528305edfc02 | |
| parent | 4e1f052c7cec89807c087b2711d35e07eeb63578 (diff) | |
| download | carrois-gothic-sc-a2e0fa8fa4e6eeb77658deee5d5f6e447d289509.tar.gz | |
Convert Android.mk to Android.bp.android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13
See build/soong/README.md for more information.
Fixes: b/122332224
Test: Built and checked if the font was installed in the correct
location.
Change-Id: I44d6d9fe7553f9f0fa275afbe87feef4c4131024
| -rw-r--r-- | Android.bp | 18 | ||||
| -rw-r--r-- | Android.mk | 30 |
2 files changed, 18 insertions, 30 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..e1d62df --- /dev/null +++ b/Android.bp @@ -0,0 +1,18 @@ +// 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 deleted file mode 100644 index 6f7918f..0000000 --- a/Android.mk +++ /dev/null @@ -1,30 +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 := 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 |