Merge SP1A.210616.001

Change-Id: I36fe54e064a9b91296173033165191fe2cb44693

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
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