Merge "bliss: Move fonts to separate makefile" into q10
diff --git a/config/common.mk b/config/common.mk
index 61be664..7ffa12b 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -167,32 +167,8 @@
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/bliss/overlay
DEVICE_PACKAGE_OVERLAYS += vendor/bliss/overlay/common
-# Google fonts
-PRODUCT_COPY_FILES += \
- vendor/bliss/prebuilt/product/etc/fonts_customization.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/fonts_customization.xml \
- vendor/bliss/prebuilt/product/fonts/ArbutusSlab-Regular.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/ArbutusSlab-Regular.ttf \
- vendor/bliss/prebuilt/product/fonts/GoogleSans-BoldItalic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/GoogleSans-BoldItalic.ttf \
- vendor/bliss/prebuilt/product/fonts/GoogleSans-Bold.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/GoogleSans-Bold.ttf \
- vendor/bliss/prebuilt/product/fonts/GoogleSans-Italic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/GoogleSans-Italic.ttf \
- vendor/bliss/prebuilt/product/fonts/GoogleSans-MediumItalic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/GoogleSans-MediumItalic.ttf \
- vendor/bliss/prebuilt/product/fonts/GoogleSans-Medium.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/GoogleSans-Medium.ttf \
- vendor/bliss/prebuilt/product/fonts/GoogleSans-Regular.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/GoogleSans-Regular.ttf \
- vendor/bliss/prebuilt/product/fonts/Lato-BoldItalic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/Lato-BoldItalic.ttf \
- vendor/bliss/prebuilt/product/fonts/Lato-Bold.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/Lato-Bold.ttf \
- vendor/bliss/prebuilt/product/fonts/Lato-Italic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/Lato-Italic.ttf \
- vendor/bliss/prebuilt/product/fonts/Lato-MediumItalic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/Lato-MediumItalic.ttf \
- vendor/bliss/prebuilt/product/fonts/Lato-Medium.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/Lato-Medium.ttf \
- vendor/bliss/prebuilt/product/fonts/Lato-Regular.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/Lato-Regular.ttf \
- vendor/bliss/prebuilt/product/fonts/Rubik-BoldItalic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/Rubik-BoldItalic.ttf \
- vendor/bliss/prebuilt/product/fonts/Rubik-Bold.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/Rubik-Bold.ttf \
- vendor/bliss/prebuilt/product/fonts/Rubik-Italic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/Rubik-Italic.ttf \
- vendor/bliss/prebuilt/product/fonts/Rubik-MediumItalic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/Rubik-MediumItalic.ttf \
- vendor/bliss/prebuilt/product/fonts/Rubik-Medium.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/Rubik-Medium.ttf \
- vendor/bliss/prebuilt/product/fonts/Rubik-Regular.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/Rubik-Regular.ttf \
- vendor/bliss/prebuilt/product/fonts/ZillaSlab-MediumItalic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/ZillaSlab-MediumItalic.ttf \
- vendor/bliss/prebuilt/product/fonts/ZillaSlab-Medium.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/ZillaSlab-Medium.ttf \
- vendor/bliss/prebuilt/product/fonts/ZillaSlab-SemiBoldItalic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/ZillaSlab-SemiBoldItalic.ttf \
- vendor/bliss/prebuilt/product/fonts/ZillaSlab-SemiBold.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/ZillaSlab-SemiBold.ttf
+# Include Google fonts
+include vendor/bliss/config/fonts.mk
# Bliss Versioning System
-include vendor/bliss/config/versions.mk
diff --git a/config/fonts.mk b/config/fonts.mk
new file mode 100644
index 0000000..f6edc6d
--- /dev/null
+++ b/config/fonts.mk
@@ -0,0 +1,10 @@
+# Google fonts
+PRODUCT_COPY_FILES += \
+ vendor/bliss/prebuilt/product/etc/fonts_customization.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/fonts_customization.xml \
+ vendor/bliss/prebuilt/product/fonts/ArbutusSlab-Regular.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/ArbutusSlab-Regular.ttf \
+ vendor/bliss/prebuilt/product/fonts/GoogleSans-BoldItalic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/GoogleSans-BoldItalic.ttf \
+ vendor/bliss/prebuilt/product/fonts/GoogleSans-Bold.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/GoogleSans-Bold.ttf \
+ vendor/bliss/prebuilt/product/fonts/GoogleSans-Italic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/GoogleSans-Italic.ttf \
+ vendor/bliss/prebuilt/product/fonts/GoogleSans-MediumItalic.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/GoogleSans-MediumItalic.ttf \
+ vendor/bliss/prebuilt/product/fonts/GoogleSans-Medium.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/GoogleSans-Medium.ttf \
+ vendor/bliss/prebuilt/product/fonts/GoogleSans-Regular.ttf:$(TARGET_COPY_OUT_PRODUCT)/fonts/GoogleSans-Regular.ttf
diff --git a/prebuilt/product/etc/fonts_customization.xml b/prebuilt/product/etc/fonts_customization.xml
index 1c5c636..e894014 100644
--- a/prebuilt/product/etc/fonts_customization.xml
+++ b/prebuilt/product/etc/fonts_customization.xml
@@ -8,34 +8,4 @@
<font weight="700" style="italic">GoogleSans-BoldItalic.ttf</font>
</family>
<alias name="google-sans-medium" to="google-sans" weight="500" />
-
- <family customizationType="new-named-family" name="arbutus-slab">
- <font weight="400" style="normal">ArbutusSlab-Regular.ttf</font>
- </family>
-
- <family customizationType="new-named-family" name="lato">
- <font weight="400" style="normal">Lato-Regular.ttf</font>
- <font weight="400" style="italic">Lato-Italic.ttf</font>
- <font weight="700" style="normal">Lato-Bold.ttf</font>
- <font weight="700" style="italic">Lato-BoldItalic.ttf</font>
- </family>
- <alias name="lato-bold" to="lato" weight="700" />
-
- <family customizationType="new-named-family" name="rubik">
- <font weight="400" style="normal">Rubik-Regular.ttf</font>
- <font weight="400" style="italic">Rubik-Italic.ttf</font>
- <font weight="500" style="normal">Rubik-Medium.ttf</font>
- <font weight="500" style="italic">Rubik-MediumItalic.ttf</font>
- <font weight="700" style="normal">Rubik-Bold.ttf</font>
- <font weight="700" style="italic">Rubik-BoldItalic.ttf</font>
- </family>
- <alias name="rubik-medium" to="rubik" weight="500" />
-
- <family customizationType="new-named-family" name="zilla-slab-medium">
- <font weight="500" style="normal">ZillaSlab-Medium.ttf</font>
- <font weight="500" style="italic">ZillaSlab-MediumItalic.ttf</font>
- <font weight="600" style="normal">ZillaSlab-SemiBold.ttf</font>
- <font weight="600" style="italic">ZillaSlab-SemiBoldItalic.ttf</font>
- </family>
- <alias name="zilla-slab-semi-bold" to="zilla-slab-medium" weight="600" />
</fonts-modification>
diff --git a/prebuilt/product/fonts/ArbutusSlab-Regular.ttf b/prebuilt/product/fonts/ArbutusSlab-Regular.ttf
deleted file mode 100644
index 1e9cf78..0000000
--- a/prebuilt/product/fonts/ArbutusSlab-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/Lato-Bold.ttf b/prebuilt/product/fonts/Lato-Bold.ttf
deleted file mode 100644
index d674075..0000000
--- a/prebuilt/product/fonts/Lato-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/Lato-BoldItalic.ttf b/prebuilt/product/fonts/Lato-BoldItalic.ttf
deleted file mode 100644
index 31f9f51..0000000
--- a/prebuilt/product/fonts/Lato-BoldItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/Lato-Italic.ttf b/prebuilt/product/fonts/Lato-Italic.ttf
deleted file mode 100644
index f32cc5c..0000000
--- a/prebuilt/product/fonts/Lato-Italic.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/Lato-Medium.ttf b/prebuilt/product/fonts/Lato-Medium.ttf
deleted file mode 100644
index 0648fb2..0000000
--- a/prebuilt/product/fonts/Lato-Medium.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/Lato-MediumItalic.ttf b/prebuilt/product/fonts/Lato-MediumItalic.ttf
deleted file mode 100644
index af296ab..0000000
--- a/prebuilt/product/fonts/Lato-MediumItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/Lato-Regular.ttf b/prebuilt/product/fonts/Lato-Regular.ttf
deleted file mode 100644
index a0a25ff..0000000
--- a/prebuilt/product/fonts/Lato-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/Rubik-Bold.ttf b/prebuilt/product/fonts/Rubik-Bold.ttf
deleted file mode 100644
index 50eada5..0000000
--- a/prebuilt/product/fonts/Rubik-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/Rubik-BoldItalic.ttf b/prebuilt/product/fonts/Rubik-BoldItalic.ttf
deleted file mode 100644
index 527d4c0..0000000
--- a/prebuilt/product/fonts/Rubik-BoldItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/Rubik-Italic.ttf b/prebuilt/product/fonts/Rubik-Italic.ttf
deleted file mode 100644
index 8dc38c0..0000000
--- a/prebuilt/product/fonts/Rubik-Italic.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/Rubik-Medium.ttf b/prebuilt/product/fonts/Rubik-Medium.ttf
deleted file mode 100644
index c0b7965..0000000
--- a/prebuilt/product/fonts/Rubik-Medium.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/Rubik-MediumItalic.ttf b/prebuilt/product/fonts/Rubik-MediumItalic.ttf
deleted file mode 100644
index 7738506..0000000
--- a/prebuilt/product/fonts/Rubik-MediumItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/Rubik-Regular.ttf b/prebuilt/product/fonts/Rubik-Regular.ttf
deleted file mode 100644
index fb52c8e..0000000
--- a/prebuilt/product/fonts/Rubik-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/ZillaSlab-Medium.ttf b/prebuilt/product/fonts/ZillaSlab-Medium.ttf
deleted file mode 100644
index ef8a795..0000000
--- a/prebuilt/product/fonts/ZillaSlab-Medium.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/ZillaSlab-MediumItalic.ttf b/prebuilt/product/fonts/ZillaSlab-MediumItalic.ttf
deleted file mode 100644
index 17eedcc..0000000
--- a/prebuilt/product/fonts/ZillaSlab-MediumItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/ZillaSlab-SemiBold.ttf b/prebuilt/product/fonts/ZillaSlab-SemiBold.ttf
deleted file mode 100644
index 60d75e0..0000000
--- a/prebuilt/product/fonts/ZillaSlab-SemiBold.ttf
+++ /dev/null
Binary files differ
diff --git a/prebuilt/product/fonts/ZillaSlab-SemiBoldItalic.ttf b/prebuilt/product/fonts/ZillaSlab-SemiBoldItalic.ttf
deleted file mode 100644
index 67d9080..0000000
--- a/prebuilt/product/fonts/ZillaSlab-SemiBoldItalic.ttf
+++ /dev/null
Binary files differ