Commit d281a99a authored May 10, 2016 by Doug Felt Committed by android-build-merger May 10, 2016

Merge "Merge "Remove rifle (1F946) from emoji font." into nyc-dev am:...

Merge "Merge "Remove rifle (1F946) from emoji font." into nyc-dev am: 0a9c3878 am: aef57222" into nyc-mr1-dev-plus-aosp
am: dfaa1666

* commit 'dfaa1666':
  Remove rifle (1F946) from emoji font.

Change-Id: Ib177fabc91c761cb45f1f5f55ce3dcb75ef79e79

parents a0b82347 dfaa1666

tools/fonts/fontchain_lint.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -412,8 +412,9 @@ def parse_ucd(ucd_path):
		path.join(ucd_path, 'emoji-zwj-sequences.txt'))

		# filter modern pentathlon, as it seems likely to be removed from final spec
		# also filter rifle
		def is_excluded(n):
		return n == 0x1f93b
		return n in [0x1f93b, 0x1f946]

		def contains_excluded(t):
		if type(t) == int: