diff options
| author | Patrice Arruda <patricearruda@google.com> | 2019-05-20 16:30:09 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-20 16:30:09 -0700 |
| commit | 8c54a6b341ce312cb1ef44add56b5fb0183aaf69 (patch) | |
| tree | f8311fa58b7a50e31b99f0e6c1b1528305edfc02 | |
| parent | 344f772c902ad9f1097f74ee86540e13e6a0a047 (diff) | |
| parent | 2b75643580e1a1ad3086ad52ec6bb33ac04d82ff (diff) | |
| download | carrois-gothic-sc-8c54a6b341ce312cb1ef44add56b5fb0183aaf69.tar.gz | |
Convert Android.mk to Android.bp. am: a2e0fa8fa4 am: c4d71b1f3fandroid-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-release
am: 2b75643580
Change-Id: Iaabdb85c3d0ac7ae708310dfb53f490baa48ab28
| -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 |