summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeigo Nonaka <nona@google.com>2021-06-08 18:09:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-08 18:09:42 +0000
commitfb88e921679fb170958cd3b39e880f01a3cd4465 (patch)
tree32ab9ea9264135ec9f89e54e41a6bea9e8717ba2
parente25a683e629877886dcf6e0f26c673ccc855ee40 (diff)
parentbb627a75b86b6de6cbb29cf440767d0c7b8f9d7e (diff)
downloadroboto-fonts-fb88e921679fb170958cd3b39e880f01a3cd4465.tar.gz
Put back static Roboto font for old libraries am: ba6223c425 am: bb627a75b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/14722693 Change-Id: I5efab4488d5c7ba60d5b2ac0e1367ee33e6c13ee
-rw-r--r--Android.bp6
-rw-r--r--RobotoStatic-Regular.ttfbin0 -> 305656 bytes
-rw-r--r--fonts.mk1
3 files changed, 7 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index db054ef..ac3180e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,3 +45,9 @@ prebuilt_font {
// These symlinks are for backward compatibility.
symlinks: ["DroidSans.ttf", "DroidSans-Bold.ttf"],
}
+
+// This static version of fonts are for backward compatibility.
+prebuilt_font {
+ name: "RobotoStatic-Regular.ttf",
+ src: "RobotoStatic-Regular.ttf",
+}
diff --git a/RobotoStatic-Regular.ttf b/RobotoStatic-Regular.ttf
new file mode 100644
index 0000000..b624812
--- /dev/null
+++ b/RobotoStatic-Regular.ttf
Binary files differ
diff --git a/fonts.mk b/fonts.mk
index ec1aa48..a1f8478 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -13,4 +13,5 @@
# limitations under the License.
PRODUCT_PACKAGES := \
+ RobotoStatic-Regular.ttf \
Roboto-Regular.ttf