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

23 files changed, 6 insertions, 115 deletions

diff --git a/Android.bp b/Android.bp
index 29f3bfb..ac3180e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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
deleted file mode 100644
index 3ecbdef..0000000
--- a/Roboto-Black.ttf
+++ /dev/null
diff --git a/Roboto-BlackItalic.ttf b/Roboto-BlackItalic.ttf
deleted file mode 100644
index 44c086c..0000000
--- a/Roboto-BlackItalic.ttf
+++ /dev/null
diff --git a/Roboto-Bold.ttf b/Roboto-Bold.ttf
deleted file mode 100644
index 70def3f..0000000
--- a/Roboto-Bold.ttf
+++ /dev/null
diff --git a/Roboto-BoldItalic.ttf b/Roboto-BoldItalic.ttf
deleted file mode 100644
index 216f9ce..0000000
--- a/Roboto-BoldItalic.ttf
+++ /dev/null
diff --git a/Roboto-Italic.ttf b/Roboto-Italic.ttf
deleted file mode 100644
index f0f33db..0000000
--- a/Roboto-Italic.ttf
+++ /dev/null
diff --git a/Roboto-Light.ttf b/Roboto-Light.ttf
deleted file mode 100644
index 3a03044..0000000
--- a/Roboto-Light.ttf
+++ /dev/null
diff --git a/Roboto-LightItalic.ttf b/Roboto-LightItalic.ttf
deleted file mode 100644
index 983381b..0000000
--- a/Roboto-LightItalic.ttf
+++ /dev/null
diff --git a/Roboto-Medium.ttf b/Roboto-Medium.ttf
deleted file mode 100644
index 284b1ba..0000000
--- a/Roboto-Medium.ttf
+++ /dev/null
diff --git a/Roboto-MediumItalic.ttf b/Roboto-MediumItalic.ttf
deleted file mode 100644
index a0b10d2..0000000
--- a/Roboto-MediumItalic.ttf
+++ /dev/null
diff --git a/Roboto-Regular.ttf b/Roboto-Regular.ttf
index 500b104..3e8317b 100644
--- a/Roboto-Regular.ttf
+++ b/Roboto-Regular.ttf
diff --git a/Roboto-Thin.ttf b/Roboto-Thin.ttf
deleted file mode 100644
index 0c7d50b..0000000
--- a/Roboto-Thin.ttf
+++ /dev/null
diff --git a/Roboto-ThinItalic.ttf b/Roboto-ThinItalic.ttf
deleted file mode 100644
index 277d8cf..0000000
--- a/Roboto-ThinItalic.ttf
+++ /dev/null
diff --git a/RobotoCondensed-Bold.ttf b/RobotoCondensed-Bold.ttf
deleted file mode 100644
index f1de58f..0000000
--- a/RobotoCondensed-Bold.ttf
+++ /dev/null
diff --git a/RobotoCondensed-BoldItalic.ttf b/RobotoCondensed-BoldItalic.ttf
deleted file mode 100644
index dc0ae5d..0000000
--- a/RobotoCondensed-BoldItalic.ttf
+++ /dev/null
diff --git a/RobotoCondensed-Italic.ttf b/RobotoCondensed-Italic.ttf
deleted file mode 100644
index 7f075cf..0000000
--- a/RobotoCondensed-Italic.ttf
+++ /dev/null
diff --git a/RobotoCondensed-Light.ttf b/RobotoCondensed-Light.ttf
deleted file mode 100644
index 2c514ba..0000000
--- a/RobotoCondensed-Light.ttf
+++ /dev/null
diff --git a/RobotoCondensed-LightItalic.ttf b/RobotoCondensed-LightItalic.ttf
deleted file mode 100644
index 248ffe8..0000000
--- a/RobotoCondensed-LightItalic.ttf
+++ /dev/null
diff --git a/RobotoCondensed-Medium.ttf b/RobotoCondensed-Medium.ttf
deleted file mode 100644
index b3393ed..0000000
--- a/RobotoCondensed-Medium.ttf
+++ /dev/null
diff --git a/RobotoCondensed-MediumItalic.ttf b/RobotoCondensed-MediumItalic.ttf
deleted file mode 100644
index a8fd4f7..0000000
--- a/RobotoCondensed-MediumItalic.ttf
+++ /dev/null
diff --git a/RobotoCondensed-Regular.ttf b/RobotoCondensed-Regular.ttf
deleted file mode 100644
index 5ae7043..0000000
--- a/RobotoCondensed-Regular.ttf
+++ /dev/null
diff --git a/RobotoStatic-Regular.ttf b/RobotoStatic-Regular.ttf
new file mode 100644
index 0000000..b624812
--- /dev/null
+++ b/RobotoStatic-Regular.ttf
diff --git a/fonts.mk b/fonts.mk
index 2ba713e..a1f8478 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -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