diff --git a/google-fonts/Android.mk b/google-fonts/Android.mk deleted file mode 100644 index ae4ca12..0000000 --- a/google-fonts/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -GOOGLE_FONTS := \ - GoogleSans-Bold.ttf \ - GoogleSans-BoldItalic.ttf \ - GoogleSans-Italic.ttf \ - GoogleSans-Medium.ttf \ - GoogleSans-MediumItalic.ttf \ - GoogleSans-Regular.ttf - -define define-google-font -include $$(CLEAR_VARS) -LOCAL_MODULE := $1 -LOCAL_MODULE_OWNER := google -LOCAL_SRC_FILES := fonts/$1 -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/fonts -LOCAL_PRODUCT_MODULE := true -include $$(BUILD_PREBUILT) -endef - -$(foreach font,$(GOOGLE_FONTS),\ - $(eval $(call define-google-font,$(font)))) - -include $(CLEAR_VARS) -LOCAL_MODULE := GoogleFonts -LOCAL_MODULE_OWNER := google -LOCAL_MODULE_TAGS := optional -LOCAL_REQUIRED_MODULES := $(GOOGLE_FONTS) -include $(BUILD_PHONY_PACKAGE) diff --git a/google-fonts/fonts/GoogleSans-Bold.ttf b/google-fonts/fonts/GoogleSans-Bold.ttf deleted file mode 100644 index ebe59de..0000000 Binary files a/google-fonts/fonts/GoogleSans-Bold.ttf and /dev/null differ diff --git a/google-fonts/fonts/GoogleSans-BoldItalic.ttf b/google-fonts/fonts/GoogleSans-BoldItalic.ttf deleted file mode 100644 index b4f65cb..0000000 Binary files a/google-fonts/fonts/GoogleSans-BoldItalic.ttf and /dev/null differ diff --git a/google-fonts/fonts/GoogleSans-Italic.ttf b/google-fonts/fonts/GoogleSans-Italic.ttf deleted file mode 100644 index 71b0776..0000000 Binary files a/google-fonts/fonts/GoogleSans-Italic.ttf and /dev/null differ diff --git a/google-fonts/fonts/GoogleSans-Medium.ttf b/google-fonts/fonts/GoogleSans-Medium.ttf deleted file mode 100644 index 289f0ff..0000000 Binary files a/google-fonts/fonts/GoogleSans-Medium.ttf and /dev/null differ diff --git a/google-fonts/fonts/GoogleSans-MediumItalic.ttf b/google-fonts/fonts/GoogleSans-MediumItalic.ttf deleted file mode 100644 index 5c92e81..0000000 Binary files a/google-fonts/fonts/GoogleSans-MediumItalic.ttf and /dev/null differ diff --git a/google-fonts/fonts/GoogleSans-Regular.ttf b/google-fonts/fonts/GoogleSans-Regular.ttf deleted file mode 100644 index 217911a..0000000 Binary files a/google-fonts/fonts/GoogleSans-Regular.ttf and /dev/null differ diff --git a/google-fonts/fonts_customization.xml b/google-fonts/fonts_customization.xml deleted file mode 100644 index be59c35..0000000 --- a/google-fonts/fonts_customization.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - GoogleSans-Regular.ttf - GoogleSans-Italic.ttf - GoogleSans-Medium.ttf - GoogleSans-MediumItalic.ttf - GoogleSans-Bold.ttf - GoogleSans-BoldItalic.ttf - - - diff --git a/product.mk b/product.mk index bcd5a1c..a2454c5 100644 --- a/product.mk +++ b/product.mk @@ -1,12 +1,5 @@ include vendor/google_pixel/codenames.mk -## Google Fonts -ADDITIONAL_FONTS_FILE := vendor/google_pixel/google-fonts/fonts_customization.xml - -PRODUCT_PACKAGES += \ - FontGoogleSansOverlay \ - GoogleFonts - ## Pixel Apps include vendor/google_pixel/apps/GoogleApps.mk