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

Commit adc7e831 authored Feb 27, 2015 by Roozbeh Pournader Committed by Android (Google) Code Review Feb 27, 2015

Merge "Add Roboto fonts"

parents 0cb10289 3ab85e47

target/product/core_tiny.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
		$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
		$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
		$(call inherit-product-if-exists, external/roboto-fonts/fonts.mk)

		# Overrides
		PRODUCT_BRAND := tiny

target/product/generic_no_telephony.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ $(call inherit-product-if-exists, external/google-fonts/cutive-mono/fonts.mk)
		$(call inherit-product-if-exists, external/lohit-fonts/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/roboto-fonts/fonts.mk)
		$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
		$(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)

target/product/sdk_base.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ $(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk)
		$(call inherit-product-if-exists, external/google-fonts/cutive-mono/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/roboto-fonts/fonts.mk)
		$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
		$(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)