Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38626e63 authored Mar 03, 2014 by Victoria Lease Committed by Gerrit Code Review Mar 03, 2014

Merge "Add external/google-fonts/*/fonts.mk."

parents 460ed38a 8da3a02c

target/product/generic_no_telephony.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
		ro.carrier=unknown

		$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
		$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)
		$(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts.mk)
		$(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk)
		$(call inherit-product-if-exists, external/noto-fonts/fonts.mk)
		$(call inherit-product-if-exists, external/naver-fonts/fonts.mk)
		$(call inherit-product-if-exists, external/sil-fonts/fonts.mk)

target/product/sdk.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,9 @@ include $(SRC_TARGET_DIR)/product/emulator.mk

		$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
		$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
		$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)
		$(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts.mk)
		$(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk)
		$(call inherit-product-if-exists, external/noto-fonts/fonts.mk)
		$(call inherit-product-if-exists, external/naver-fonts/fonts.mk)
		$(call inherit-product-if-exists, external/sil-fonts/fonts.mk)