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

Commit 13f295ed authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by android-build-merger
Browse files

Merge "Re-enable emoji font tests" into nyc-dev am: 2159f701 

am: 9da7bb75

* commit '9da7bb75':
  Re-enable emoji font tests

Change-Id: I09dcb56877cc0f404ad5772149c96f0cf21f9ee5
parents 7b32d9bf 9da7bb75

data/fonts/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -101,8 +101,13 @@ font_src_files := 
checkbuild: fontchain_lint



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

fontchain_lint: $(FONTCHAIN_LINTER) $(TARGET_OUT)/etc/fonts.xml

	PYTHONPATH=$$PYTHONPATH:external/fonttools/Lib \

	python $(FONTCHAIN_LINTER) $(TARGET_OUT) external/unicode
 
	python $(FONTCHAIN_LINTER) $(TARGET_OUT) $(CHECK_EMOJI) external/unicode

tools/fonts/fontchain_lint.py

+9 −7
Original line number Diff line number Diff line
@@ -177,8 +177,9 @@ def parse_fonts_xml(fonts_xml_path): 


def check_emoji_availability():

    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']

    for emoji_font in emoji_fonts:

    assert_font_supports_all_of_chars(emoji_font, emoji_chars)
@@ -273,11 +274,12 @@ def main(): 
    hyphens_dir = path.join(target_out, 'usr', 'hyphen-data')

    check_hyphens(hyphens_dir)



    ucd_path = sys.argv[2]

    check_emoji = sys.argv[2]

    if check_emoji == 'true':

        ucd_path = sys.argv[3]

        parse_ucd(ucd_path)

    # Temporarily disable emoji checks for Bug 27785690

    # check_emoji_availability()

    # check_emoji_defaults()

        check_emoji_availability()

        check_emoji_defaults()





if __name__ == '__main__':