diff options
author | Xin Li <delphij@google.com> | 2020-09-08 16:54:27 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2020-09-08 16:54:27 -0700 |
commit | a925b06d717086e33ce1f831dbdddee09410d700 (patch) | |
tree | 830d9585f9155268a98744953dac82ed36d4f2c5 | |
parent | 82064b902d3b3d5aab81a9b2c248e7fc046b9cf6 (diff) | |
parent | 69934eddd7f2c5ca0275ba2877fe71de68e5e2e1 (diff) | |
download | rubik-a925b06d717086e33ce1f831dbdddee09410d700.tar.gz |
Merge Android R
Bug: 168057903
Merged-In: If3301aad7610ef3d2472fcc677e9e89510fe652e
Change-Id: I0477925117f37d87f97b9f569494edb6b09b04d3
-rw-r--r-- | Android.bp | 49 | ||||
-rw-r--r-- | Android.mk | 50 |
2 files changed, 49 insertions, 50 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..564e43d --- /dev/null +++ b/Android.bp @@ -0,0 +1,49 @@ +// 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: "Rubik-Regular.ttf", + src: "Rubik-Regular.ttf", + product_specific: true, +} + +prebuilt_font { + name: "Rubik-Italic.ttf", + src: "Rubik-Italic.ttf", + product_specific: true, +} + +prebuilt_font { + name: "Rubik-Medium.ttf", + src: "Rubik-Medium.ttf", + product_specific: true, +} + +prebuilt_font { + name: "Rubik-MediumItalic.ttf", + src: "Rubik-MediumItalic.ttf", + product_specific: true, +} + +prebuilt_font { + name: "Rubik-Bold.ttf", + src: "Rubik-Bold.ttf", + product_specific: true, +} + +prebuilt_font { + name: "Rubik-BoldItalic.ttf", + src: "Rubik-BoldItalic.ttf", + product_specific: true, +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index b3c7fb8..0000000 --- a/Android.mk +++ /dev/null @@ -1,50 +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) -# Build the rest of font files as prebuilt. -# $(1): The source file name in LOCAL_PATH. -# It also serves as the module name and the dest file name. -define build-one-font-module -$(eval include $(CLEAR_VARS))\ -$(eval LOCAL_MODULE := $(1))\ -$(eval LOCAL_SRC_FILES := $(1))\ -$(eval LOCAL_MODULE_CLASS := ETC)\ -$(eval LOCAL_MODULE_TAGS := optional)\ -$(eval LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/fonts)\ -$(eval LOCAL_PRODUCT_MODULE := true) \ -$(eval include $(BUILD_PREBUILT)) -endef - -font_src_files := \ - Rubik-Regular.ttf \ - Rubik-Italic.ttf \ - Rubik-Medium.ttf \ - Rubik-MediumItalic.ttf \ - Rubik-Bold.ttf \ - Rubik-BoldItalic.ttf - -$(foreach f, $(font_src_files), $(call build-one-font-module, $(f))) - -build-one-font-module := -font_src_files := - -endif |