diff options
author | Xin Li <delphij@google.com> | 2020-08-27 10:16:26 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2020-08-27 10:16:26 -0700 |
commit | 674b7fc072e195ddc4cad96eb4ea6687d374d142 (patch) | |
tree | 0ffccbf9133f3ab06b170410d2e90c968f329784 | |
parent | b22b4bea8200f20bbf6df4a5f4798b76bd8e8846 (diff) | |
parent | ad4b880345abf56215da60e908cdbd3ee7d98c02 (diff) | |
download | source-sans-pro-674b7fc072e195ddc4cad96eb4ea6687d374d142.tar.gz |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507
Merged-In: I5936c387c7ec838981a31cb62923dcee81d68fe2
Change-Id: Id1d8f01e2c3407a93da8418911837b4b31e36054
-rw-r--r-- | Android.bp | 43 | ||||
-rw-r--r-- | Android.mk | 70 |
2 files changed, 43 insertions, 70 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..95a1035 --- /dev/null +++ b/Android.bp @@ -0,0 +1,43 @@ +// 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: "SourceSansPro-Regular.ttf", + src: "SourceSansPro-Regular.ttf", +} + +prebuilt_font { + name: "SourceSansPro-Italic.ttf", + src: "SourceSansPro-Italic.ttf", +} + +prebuilt_font { + name: "SourceSansPro-SemiBold.ttf", + src: "SourceSansPro-SemiBold.ttf", +} + +prebuilt_font { + name: "SourceSansPro-SemiBoldItalic.ttf", + src: "SourceSansPro-SemiBoldItalic.ttf", +} + +prebuilt_font { + name: "SourceSansPro-Bold.ttf", + src: "SourceSansPro-Bold.ttf", +} + +prebuilt_font { + name: "SourceSansPro-BoldItalic.ttf", + src: "SourceSansPro-BoldItalic.ttf", +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 13ecb60..0000000 --- a/Android.mk +++ /dev/null @@ -1,70 +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 := SourceSansPro-Regular.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := SourceSansPro-Italic.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := SourceSansPro-SemiBold.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := SourceSansPro-SemiBoldItalic.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := SourceSansPro-Bold.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := SourceSansPro-BoldItalic.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT) - -endif |