From 8ee89dbc8648ec1bd573f6623d4a5db48139edac Mon Sep 17 00:00:00 2001 From: Rod S Date: Thu, 10 Sep 2020 16:25:20 -0700 Subject: Upgrade Roboto to variable format Test: m fontchain_lint Test: Flash local device, play with Camera, Settings, Clock Bug: 158836182 Change-Id: I05efc0aacacd3cd407e765a6653bd165e5edbcc6 --- Android.bp | 99 +-------------------------------------- Roboto-Black.ttf | Bin 306428 -> 0 bytes Roboto-BlackItalic.ttf | Bin 330448 -> 0 bytes Roboto-Bold.ttf | Bin 306940 -> 0 bytes Roboto-BoldItalic.ttf | Bin 332160 -> 0 bytes Roboto-Italic.ttf | Bin 328640 -> 0 bytes Roboto-Light.ttf | Bin 307192 -> 0 bytes Roboto-LightItalic.ttf | Bin 332172 -> 0 bytes Roboto-Medium.ttf | Bin 306536 -> 0 bytes Roboto-MediumItalic.ttf | Bin 330796 -> 0 bytes Roboto-Regular.ttf | Bin 305608 -> 2372548 bytes Roboto-Thin.ttf | Bin 307664 -> 0 bytes Roboto-ThinItalic.ttf | Bin 329700 -> 0 bytes RobotoCondensed-Bold.ttf | Bin 303944 -> 0 bytes RobotoCondensed-BoldItalic.ttf | Bin 330504 -> 0 bytes RobotoCondensed-Italic.ttf | Bin 329372 -> 0 bytes RobotoCondensed-Light.ttf | Bin 302300 -> 0 bytes RobotoCondensed-LightItalic.ttf | Bin 332504 -> 0 bytes RobotoCondensed-Medium.ttf | Bin 303604 -> 0 bytes RobotoCondensed-MediumItalic.ttf | Bin 330348 -> 0 bytes RobotoCondensed-Regular.ttf | Bin 300664 -> 0 bytes fonts.mk | 21 +-------- 22 files changed, 2 insertions(+), 118 deletions(-) delete mode 100644 Roboto-Black.ttf delete mode 100644 Roboto-BlackItalic.ttf delete mode 100644 Roboto-Bold.ttf delete mode 100644 Roboto-BoldItalic.ttf delete mode 100644 Roboto-Italic.ttf delete mode 100644 Roboto-Light.ttf delete mode 100644 Roboto-LightItalic.ttf delete mode 100644 Roboto-Medium.ttf delete mode 100644 Roboto-MediumItalic.ttf delete mode 100644 Roboto-Thin.ttf delete mode 100644 Roboto-ThinItalic.ttf delete mode 100644 RobotoCondensed-Bold.ttf delete mode 100644 RobotoCondensed-BoldItalic.ttf delete mode 100644 RobotoCondensed-Italic.ttf delete mode 100644 RobotoCondensed-Light.ttf delete mode 100644 RobotoCondensed-LightItalic.ttf delete mode 100644 RobotoCondensed-Medium.ttf delete mode 100644 RobotoCondensed-MediumItalic.ttf delete mode 100644 RobotoCondensed-Regular.ttf diff --git a/Android.bp b/Android.bp index fda7ca7..e44aecf 100644 --- a/Android.bp +++ b/Android.bp @@ -26,102 +26,5 @@ prebuilt_font { name: "Roboto-Regular.ttf", src: "Roboto-Regular.ttf", // These symlinks are for backward compatibility. - symlinks: ["DroidSans.ttf"], -} - -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", + symlinks: ["DroidSans.ttf", "DroidSans-Bold.ttf"], } diff --git a/Roboto-Black.ttf b/Roboto-Black.ttf deleted file mode 100644 index 3ecbdef..0000000 Binary files a/Roboto-Black.ttf and /dev/null differ diff --git a/Roboto-BlackItalic.ttf b/Roboto-BlackItalic.ttf deleted file mode 100644 index 44c086c..0000000 Binary files a/Roboto-BlackItalic.ttf and /dev/null differ diff --git a/Roboto-Bold.ttf b/Roboto-Bold.ttf deleted file mode 100644 index 70def3f..0000000 Binary files a/Roboto-Bold.ttf and /dev/null differ diff --git a/Roboto-BoldItalic.ttf b/Roboto-BoldItalic.ttf deleted file mode 100644 index 216f9ce..0000000 Binary files a/Roboto-BoldItalic.ttf and /dev/null differ diff --git a/Roboto-Italic.ttf b/Roboto-Italic.ttf deleted file mode 100644 index f0f33db..0000000 Binary files a/Roboto-Italic.ttf and /dev/null differ diff --git a/Roboto-Light.ttf b/Roboto-Light.ttf deleted file mode 100644 index 3a03044..0000000 Binary files a/Roboto-Light.ttf and /dev/null differ diff --git a/Roboto-LightItalic.ttf b/Roboto-LightItalic.ttf deleted file mode 100644 index 983381b..0000000 Binary files a/Roboto-LightItalic.ttf and /dev/null differ diff --git a/Roboto-Medium.ttf b/Roboto-Medium.ttf deleted file mode 100644 index 284b1ba..0000000 Binary files a/Roboto-Medium.ttf and /dev/null differ diff --git a/Roboto-MediumItalic.ttf b/Roboto-MediumItalic.ttf deleted file mode 100644 index a0b10d2..0000000 Binary files a/Roboto-MediumItalic.ttf and /dev/null differ diff --git a/Roboto-Regular.ttf b/Roboto-Regular.ttf index 500b104..3e8317b 100644 Binary files a/Roboto-Regular.ttf and b/Roboto-Regular.ttf differ diff --git a/Roboto-Thin.ttf b/Roboto-Thin.ttf deleted file mode 100644 index 0c7d50b..0000000 Binary files a/Roboto-Thin.ttf and /dev/null differ diff --git a/Roboto-ThinItalic.ttf b/Roboto-ThinItalic.ttf deleted file mode 100644 index 277d8cf..0000000 Binary files a/Roboto-ThinItalic.ttf and /dev/null differ diff --git a/RobotoCondensed-Bold.ttf b/RobotoCondensed-Bold.ttf deleted file mode 100644 index f1de58f..0000000 Binary files a/RobotoCondensed-Bold.ttf and /dev/null differ diff --git a/RobotoCondensed-BoldItalic.ttf b/RobotoCondensed-BoldItalic.ttf deleted file mode 100644 index dc0ae5d..0000000 Binary files a/RobotoCondensed-BoldItalic.ttf and /dev/null differ diff --git a/RobotoCondensed-Italic.ttf b/RobotoCondensed-Italic.ttf deleted file mode 100644 index 7f075cf..0000000 Binary files a/RobotoCondensed-Italic.ttf and /dev/null differ diff --git a/RobotoCondensed-Light.ttf b/RobotoCondensed-Light.ttf deleted file mode 100644 index 2c514ba..0000000 Binary files a/RobotoCondensed-Light.ttf and /dev/null differ diff --git a/RobotoCondensed-LightItalic.ttf b/RobotoCondensed-LightItalic.ttf deleted file mode 100644 index 248ffe8..0000000 Binary files a/RobotoCondensed-LightItalic.ttf and /dev/null differ diff --git a/RobotoCondensed-Medium.ttf b/RobotoCondensed-Medium.ttf deleted file mode 100644 index b3393ed..0000000 Binary files a/RobotoCondensed-Medium.ttf and /dev/null differ diff --git a/RobotoCondensed-MediumItalic.ttf b/RobotoCondensed-MediumItalic.ttf deleted file mode 100644 index a8fd4f7..0000000 Binary files a/RobotoCondensed-MediumItalic.ttf and /dev/null differ diff --git a/RobotoCondensed-Regular.ttf b/RobotoCondensed-Regular.ttf deleted file mode 100644 index 5ae7043..0000000 Binary files a/RobotoCondensed-Regular.ttf and /dev/null differ diff --git a/fonts.mk b/fonts.mk index 2ba713e..ec1aa48 100644 --- a/fonts.mk +++ b/fonts.mk @@ -13,23 +13,4 @@ # 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 + Roboto-Regular.ttf -- cgit v1.2.3