Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Add to PRODUCT_COPY_FILES/PRODUCT_PACKAGES instead of replacing
Browse files Browse the repository at this point in the history 
Change-Id: I317b5ac3399cf82e4c708b52d84112d4b7b7d3df
  • Loading branch information
Michael Vines committed Apr 26, 2013
1 parent 1333283 commit da67dc6
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions fonts.mk
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Warning: this is actually a product definition, to be inherited from # Warning: this is actually a product definition, to be inherited from


# Android fonts # Android fonts
PRODUCT_COPY_FILES := \ PRODUCT_COPY_FILES += \
frameworks/base/data/fonts/DroidNaskh-Regular.ttf:system/fonts/DroidNaskh-Regular.ttf \ frameworks/base/data/fonts/DroidNaskh-Regular.ttf:system/fonts/DroidNaskh-Regular.ttf \
frameworks/base/data/fonts/DroidSansHebrew-Regular.ttf:system/fonts/DroidSansHebrew-Regular.ttf \ frameworks/base/data/fonts/DroidSansHebrew-Regular.ttf:system/fonts/DroidSansHebrew-Regular.ttf \
frameworks/base/data/fonts/DroidSansHebrew-Bold.ttf:system/fonts/DroidSansHebrew-Bold.ttf \ frameworks/base/data/fonts/DroidSansHebrew-Bold.ttf:system/fonts/DroidSansHebrew-Bold.ttf \
Expand All @@ -28,12 +28,11 @@ PRODUCT_COPY_FILES := \
frameworks/base/data/fonts/DroidSerif-BoldItalic.ttf:system/fonts/DroidSerif-BoldItalic.ttf \ frameworks/base/data/fonts/DroidSerif-BoldItalic.ttf:system/fonts/DroidSerif-BoldItalic.ttf \
$(NULL) $(NULL)


PRODUCT_PACKAGES := \ PRODUCT_PACKAGES += \
DroidSansFallback.ttf DroidSansFallback.ttf


# MozTT fonts # MozTT fonts
PRODUCT_COPY_FILES := \ PRODUCT_COPY_FILES += \
$(PRODUCT_COPY_FILES) \

This comment has been minimized.

Sign in to view

Copy link
@michaelwu

michaelwu Apr 26, 2013

Contributor

The manual += done here is actually somewhat intentional - IIRC it forces make to expand variables now instead of waiting until PRODUCT_COPY_FILES is used, which makes things faster. Probably doesn't matter a whole lot in this case I guess.
external/moztt/CharisSILCompact-4.110/CharisSILCompact-B.ttf:system/fonts/CharisSILCompact-B.ttf \ external/moztt/CharisSILCompact-4.110/CharisSILCompact-B.ttf:system/fonts/CharisSILCompact-B.ttf \
external/moztt/CharisSILCompact-4.110/CharisSILCompact-BI.ttf:system/fonts/CharisSILCompact-BI.ttf \ external/moztt/CharisSILCompact-4.110/CharisSILCompact-BI.ttf:system/fonts/CharisSILCompact-BI.ttf \
external/moztt/CharisSILCompact-4.110/CharisSILCompact-I.ttf:system/fonts/CharisSILCompact-I.ttf \ external/moztt/CharisSILCompact-4.110/CharisSILCompact-I.ttf:system/fonts/CharisSILCompact-I.ttf \
Expand Down

2 comments on commit da67dc6

@mvines
Copy link

@mvines mvines commented on da67dc6 Apr 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Provided that the initial declaration of PRODUCT_COPY_FILES is set as a simple variable (:=) then all subsequent += will not be deferred so no performance impact (however negligible it would be!)

@michaelwu
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh, didn't know that. I just read the gnu manual about this which confirms this behavior. Thanks for the info.

Please sign in to comment.