diff options
author | Xin Li <delphij@google.com> | 2021-10-06 22:53:16 +0000 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2021-10-06 22:53:16 +0000 |
commit | 2ac2cae4ede7242dbd938d78d0ddc061986f8d09 (patch) | |
tree | 32ab9ea9264135ec9f89e54e41a6bea9e8717ba2 | |
parent | 3102e62f69d98bb8dace67ad7aa49247724b4661 (diff) | |
parent | 77493a891fb04ab59ad746c14ca5eead617ac5bf (diff) | |
download | roboto-fonts-2ac2cae4ede7242dbd938d78d0ddc061986f8d09.tar.gz |
Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1
Bug: 202323961
Merged-In: I61e1df4c9a673dbdf43a6166d0acd4e2ff15b9c5
Change-Id: I0ddfad6880654b9b22b218d5a1bed41ea3e149f6
-rw-r--r-- | Android.bp | 99 | ||||
-rw-r--r-- | Roboto-Black.ttf | bin | 306428 -> 0 bytes | |||
-rw-r--r-- | Roboto-BlackItalic.ttf | bin | 330448 -> 0 bytes | |||
-rw-r--r-- | Roboto-Bold.ttf | bin | 306940 -> 0 bytes | |||
-rw-r--r-- | Roboto-BoldItalic.ttf | bin | 332160 -> 0 bytes | |||
-rw-r--r-- | Roboto-Italic.ttf | bin | 328640 -> 0 bytes | |||
-rw-r--r-- | Roboto-Light.ttf | bin | 307192 -> 0 bytes | |||
-rw-r--r-- | Roboto-LightItalic.ttf | bin | 332172 -> 0 bytes | |||
-rw-r--r-- | Roboto-Medium.ttf | bin | 306536 -> 0 bytes | |||
-rw-r--r-- | Roboto-MediumItalic.ttf | bin | 330796 -> 0 bytes | |||
-rw-r--r-- | Roboto-Regular.ttf | bin | 305608 -> 2372548 bytes | |||
-rw-r--r-- | Roboto-Thin.ttf | bin | 307664 -> 0 bytes | |||
-rw-r--r-- | Roboto-ThinItalic.ttf | bin | 329700 -> 0 bytes | |||
-rw-r--r-- | RobotoCondensed-Bold.ttf | bin | 303944 -> 0 bytes | |||
-rw-r--r-- | RobotoCondensed-BoldItalic.ttf | bin | 330504 -> 0 bytes | |||
-rw-r--r-- | RobotoCondensed-Italic.ttf | bin | 329372 -> 0 bytes | |||
-rw-r--r-- | RobotoCondensed-Light.ttf | bin | 302300 -> 0 bytes | |||
-rw-r--r-- | RobotoCondensed-LightItalic.ttf | bin | 332504 -> 0 bytes | |||
-rw-r--r-- | RobotoCondensed-Medium.ttf | bin | 303604 -> 0 bytes | |||
-rw-r--r-- | RobotoCondensed-MediumItalic.ttf | bin | 330348 -> 0 bytes | |||
-rw-r--r-- | RobotoCondensed-Regular.ttf | bin | 300664 -> 0 bytes | |||
-rw-r--r-- | RobotoStatic-Regular.ttf | bin | 0 -> 305656 bytes | |||
-rw-r--r-- | fonts.mk | 22 |
23 files changed, 6 insertions, 115 deletions
@@ -43,102 +43,11 @@ prebuilt_font { name: "Roboto-Regular.ttf", src: "Roboto-Regular.ttf", // These symlinks are for backward compatibility. - symlinks: ["DroidSans.ttf"], + symlinks: ["DroidSans.ttf", "DroidSans-Bold.ttf"], } +// This static version of fonts are for backward compatibility. prebuilt_font { - name: "Roboto-Bold.ttf", - src: "Roboto-Bold.ttf", - // These symlinks are for backward compatibility. - symlinks: ["DroidSans-Bold.ttf"], -} - -prebuilt_font { - name: "Roboto-Italic.ttf", - src: "Roboto-Italic.ttf", -} - -prebuilt_font { - name: "Roboto-BoldItalic.ttf", - src: "Roboto-BoldItalic.ttf", -} - -prebuilt_font { - name: "Roboto-Black.ttf", - src: "Roboto-Black.ttf", -} - -prebuilt_font { - name: "Roboto-BlackItalic.ttf", - src: "Roboto-BlackItalic.ttf", -} - -prebuilt_font { - name: "Roboto-Light.ttf", - src: "Roboto-Light.ttf", -} - -prebuilt_font { - name: "Roboto-LightItalic.ttf", - src: "Roboto-LightItalic.ttf", -} - -prebuilt_font { - name: "Roboto-Medium.ttf", - src: "Roboto-Medium.ttf", -} - -prebuilt_font { - name: "Roboto-MediumItalic.ttf", - src: "Roboto-MediumItalic.ttf", -} - -prebuilt_font { - name: "Roboto-Thin.ttf", - src: "Roboto-Thin.ttf", -} - -prebuilt_font { - name: "Roboto-ThinItalic.ttf", - src: "Roboto-ThinItalic.ttf", -} - -prebuilt_font { - name: "RobotoCondensed-Regular.ttf", - src: "RobotoCondensed-Regular.ttf", -} - -prebuilt_font { - name: "RobotoCondensed-Bold.ttf", - src: "RobotoCondensed-Bold.ttf", -} - -prebuilt_font { - name: "RobotoCondensed-Italic.ttf", - src: "RobotoCondensed-Italic.ttf", -} - -prebuilt_font { - name: "RobotoCondensed-BoldItalic.ttf", - src: "RobotoCondensed-BoldItalic.ttf", -} - -prebuilt_font { - name: "RobotoCondensed-Light.ttf", - src: "RobotoCondensed-Light.ttf", -} - -prebuilt_font { - name: "RobotoCondensed-LightItalic.ttf", - src: "RobotoCondensed-LightItalic.ttf", -} - -prebuilt_font { - name: "RobotoCondensed-Medium.ttf", - src: "RobotoCondensed-Medium.ttf", -} - -prebuilt_font { - name: "RobotoCondensed-MediumItalic.ttf", - src: "RobotoCondensed-MediumItalic.ttf", + name: "RobotoStatic-Regular.ttf", + src: "RobotoStatic-Regular.ttf", } diff --git a/Roboto-Black.ttf b/Roboto-Black.ttf Binary files differdeleted file mode 100644 index 3ecbdef..0000000 --- a/Roboto-Black.ttf +++ /dev/null diff --git a/Roboto-BlackItalic.ttf b/Roboto-BlackItalic.ttf Binary files differdeleted file mode 100644 index 44c086c..0000000 --- a/Roboto-BlackItalic.ttf +++ /dev/null diff --git a/Roboto-Bold.ttf b/Roboto-Bold.ttf Binary files differdeleted file mode 100644 index 70def3f..0000000 --- a/Roboto-Bold.ttf +++ /dev/null diff --git a/Roboto-BoldItalic.ttf b/Roboto-BoldItalic.ttf Binary files differdeleted file mode 100644 index 216f9ce..0000000 --- a/Roboto-BoldItalic.ttf +++ /dev/null diff --git a/Roboto-Italic.ttf b/Roboto-Italic.ttf Binary files differdeleted file mode 100644 index f0f33db..0000000 --- a/Roboto-Italic.ttf +++ /dev/null diff --git a/Roboto-Light.ttf b/Roboto-Light.ttf Binary files differdeleted file mode 100644 index 3a03044..0000000 --- a/Roboto-Light.ttf +++ /dev/null diff --git a/Roboto-LightItalic.ttf b/Roboto-LightItalic.ttf Binary files differdeleted file mode 100644 index 983381b..0000000 --- a/Roboto-LightItalic.ttf +++ /dev/null diff --git a/Roboto-Medium.ttf b/Roboto-Medium.ttf Binary files differdeleted file mode 100644 index 284b1ba..0000000 --- a/Roboto-Medium.ttf +++ /dev/null diff --git a/Roboto-MediumItalic.ttf b/Roboto-MediumItalic.ttf Binary files differdeleted file mode 100644 index a0b10d2..0000000 --- a/Roboto-MediumItalic.ttf +++ /dev/null diff --git a/Roboto-Regular.ttf b/Roboto-Regular.ttf Binary files differindex 500b104..3e8317b 100644 --- a/Roboto-Regular.ttf +++ b/Roboto-Regular.ttf diff --git a/Roboto-Thin.ttf b/Roboto-Thin.ttf Binary files differdeleted file mode 100644 index 0c7d50b..0000000 --- a/Roboto-Thin.ttf +++ /dev/null diff --git a/Roboto-ThinItalic.ttf b/Roboto-ThinItalic.ttf Binary files differdeleted file mode 100644 index 277d8cf..0000000 --- a/Roboto-ThinItalic.ttf +++ /dev/null diff --git a/RobotoCondensed-Bold.ttf b/RobotoCondensed-Bold.ttf Binary files differdeleted file mode 100644 index f1de58f..0000000 --- a/RobotoCondensed-Bold.ttf +++ /dev/null diff --git a/RobotoCondensed-BoldItalic.ttf b/RobotoCondensed-BoldItalic.ttf Binary files differdeleted file mode 100644 index dc0ae5d..0000000 --- a/RobotoCondensed-BoldItalic.ttf +++ /dev/null diff --git a/RobotoCondensed-Italic.ttf b/RobotoCondensed-Italic.ttf Binary files differdeleted file mode 100644 index 7f075cf..0000000 --- a/RobotoCondensed-Italic.ttf +++ /dev/null diff --git a/RobotoCondensed-Light.ttf b/RobotoCondensed-Light.ttf Binary files differdeleted file mode 100644 index 2c514ba..0000000 --- a/RobotoCondensed-Light.ttf +++ /dev/null diff --git a/RobotoCondensed-LightItalic.ttf b/RobotoCondensed-LightItalic.ttf Binary files differdeleted file mode 100644 index 248ffe8..0000000 --- a/RobotoCondensed-LightItalic.ttf +++ /dev/null diff --git a/RobotoCondensed-Medium.ttf b/RobotoCondensed-Medium.ttf Binary files differdeleted file mode 100644 index b3393ed..0000000 --- a/RobotoCondensed-Medium.ttf +++ /dev/null diff --git a/RobotoCondensed-MediumItalic.ttf b/RobotoCondensed-MediumItalic.ttf Binary files differdeleted file mode 100644 index a8fd4f7..0000000 --- a/RobotoCondensed-MediumItalic.ttf +++ /dev/null diff --git a/RobotoCondensed-Regular.ttf b/RobotoCondensed-Regular.ttf Binary files differdeleted file mode 100644 index 5ae7043..0000000 --- a/RobotoCondensed-Regular.ttf +++ /dev/null diff --git a/RobotoStatic-Regular.ttf b/RobotoStatic-Regular.ttf Binary files differnew file mode 100644 index 0000000..b624812 --- /dev/null +++ b/RobotoStatic-Regular.ttf @@ -13,23 +13,5 @@ # limitations under the License. PRODUCT_PACKAGES := \ - Roboto-Regular.ttf \ - Roboto-Bold.ttf \ - Roboto-Italic.ttf \ - Roboto-BoldItalic.ttf \ - Roboto-Black.ttf \ - Roboto-BlackItalic.ttf \ - Roboto-Light.ttf \ - Roboto-LightItalic.ttf \ - Roboto-Medium.ttf \ - Roboto-MediumItalic.ttf \ - Roboto-Thin.ttf \ - Roboto-ThinItalic.ttf \ - RobotoCondensed-Regular.ttf \ - RobotoCondensed-Bold.ttf \ - RobotoCondensed-Italic.ttf \ - RobotoCondensed-BoldItalic.ttf \ - RobotoCondensed-Light.ttf \ - RobotoCondensed-LightItalic.ttf \ - RobotoCondensed-Medium.ttf \ - RobotoCondensed-MediumItalic.ttf + RobotoStatic-Regular.ttf \ + Roboto-Regular.ttf |