diff options
| author | Victoria Lease <violets@android.com> | 2014-03-03 23:49:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-03 23:49:36 +0000 |
| commit | c9b7f3d6a1a2e5325b762d43cb98169047b122e7 (patch) | |
| tree | 8a8eb6a878f87b5bfd4f22d89b18a48c6179dc70 /target/product/generic_no_telephony.mk | |
| parent | 7676dbe03e124bbe830275f73c3fffd93fec6be0 (diff) | |
| parent | 3c14d21a2a62398322479e015fecdb43652fb331 (diff) | |
| download | build-c9b7f3d6a1a2e5325b762d43cb98169047b122e7.zip build-c9b7f3d6a1a2e5325b762d43cb98169047b122e7.tar.gz build-c9b7f3d6a1a2e5325b762d43cb98169047b122e7.tar.bz2 | |
am 3c14d21a: am 14a5be01: am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '3c14d21a2a62398322479e015fecdb43652fb331':
Add external/google-fonts/*/fonts.mk.
Diffstat (limited to 'target/product/generic_no_telephony.mk')
| -rw-r--r-- | target/product/generic_no_telephony.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index 33a1dde..5905b8a 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk @@ -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) |