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

Commit c9b7f3d6 authored Mar 03, 2014 by Victoria Lease Committed by Android Git Automerger Mar 03, 2014

am 3c14d21a: am 14a5be01: am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."

* commit '3c14d21a':
  Add external/google-fonts/*/fonts.mk.

parents 7676dbe0 3c14d21a

target/product/generic_no_telephony.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,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
		@@ -75,6 +75,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)