Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Re-enable emoji font tests" into nyc-dev

Browse Source
This commit is contained in:
Roozbeh Pournader
2016-03-31 22:22:18 +00:00
committed by Android (Google) Code Review
parent c2a091a04b 27ec3ace18
commit 2159f7017d
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/fonts/Android.mk
View File

@@ -101,8 +101,13 @@ font_src_files :=
checkbuild: fontchain_lint checkbuild: fontchain_lint
FONTCHAIN_LINTER := frameworks/base/tools/fonts/fontchain_lint.py FONTCHAIN_LINTER := frameworks/base/tools/fonts/fontchain_lint.py
ifeq ($(SMALLER_FONT_FOOTPRINT),true)
CHECK_EMOJI := false
else
CHECK_EMOJI := true
endif
.PHONY: fontchain_lint .PHONY: fontchain_lint
fontchain_lint: $(FONTCHAIN_LINTER) $(TARGET_OUT)/etc/fonts.xml fontchain_lint: $(FONTCHAIN_LINTER) $(TARGET_OUT)/etc/fonts.xml
PYTHONPATH=$$PYTHONPATH:external/fonttools/Lib \ PYTHONPATH=$$PYTHONPATH:external/fonttools/Lib \
python $(FONTCHAIN_LINTER) $(TARGET_OUT) external/unicode python $(FONTCHAIN_LINTER) $(TARGET_OUT) $(CHECK_EMOJI) external/unicode

16
tools/fonts/fontchain_lint.py
View File

@@ -177,9 +177,10 @@ def parse_fonts_xml(fonts_xml_path):
def check_emoji_availability(): def check_emoji_availability():
emoji_fonts = [font[5] for font in _fallback_chain if 'Zsye' in font[1]] emoji_fonts = [font[5] for font in _fallback_chain if 'Zsye' in font[1]]
assert len(emoji_fonts) == 1, 'There are %d emoji fonts.' % len(emoji_fonts)
emoji_font = emoji_fonts[0]
emoji_chars = _emoji_properties['Emoji'] emoji_chars = _emoji_properties['Emoji']
for emoji_font in emoji_fonts: assert_font_supports_all_of_chars(emoji_font, emoji_chars)
assert_font_supports_all_of_chars(emoji_font, emoji_chars)
def check_emoji_defaults(): def check_emoji_defaults():
@@ -273,11 +274,12 @@ def main():
hyphens_dir = path.join(target_out, 'usr', 'hyphen-data') hyphens_dir = path.join(target_out, 'usr', 'hyphen-data')
check_hyphens(hyphens_dir) check_hyphens(hyphens_dir)
ucd_path = sys.argv[2] check_emoji = sys.argv[2]
parse_ucd(ucd_path) if check_emoji == 'true':
# Temporarily disable emoji checks for Bug 27785690 ucd_path = sys.argv[3]
# check_emoji_availability() parse_ucd(ucd_path)
# check_emoji_defaults() check_emoji_availability()
check_emoji_defaults()
if __name__ == '__main__': if __name__ == '__main__':