summaryrefslogtreecommitdiff
path: root/data/fonts
diff options
context:
space:
mode:
authorNan Zhang <nanzhang@google.com>2017-11-17 22:30:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-17 22:30:37 +0000
commit24c992479799c8330f6b837d504bac7970310947 (patch)
tree4d8c4df0319c7930dcc9dcb96a589f0f8af014fc /data/fonts
parent344072e2f678cf02b597e16a078c05ef270a4b5d (diff)
parent67695d3aff7553f80bbcda88e6a2c1c0cb9f7632 (diff)
Merge "Build fontchain_lint using python_binary_host" am: 7ecac139ea am: 7ade558ad2
am: 67695d3aff Change-Id: I850304f79c1c35bfeb6951307b8ca2365da0330b
Diffstat (limited to 'data/fonts')
-rw-r--r--data/fonts/Android.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 7b2fa76f01df..81164d5e63a0 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -112,7 +112,7 @@ include $(BUILD_PREBUILT)
# Run sanity tests on fonts on checkbuild
checkbuild: fontchain_lint
-FONTCHAIN_LINTER := frameworks/base/tools/fonts/fontchain_lint.py
+FONTCHAIN_LINTER := $(HOST_OUT_EXECUTABLES)/fontchain_linter
ifeq ($(MINIMAL_FONT_FOOTPRINT),true)
CHECK_EMOJI := false
else
@@ -121,5 +121,4 @@ endif
.PHONY: fontchain_lint
fontchain_lint: $(FONTCHAIN_LINTER) $(TARGET_OUT)/etc/fonts.xml $(PRODUCT_OUT)/system.img
- PYTHONPATH=$$PYTHONPATH:external/fonttools/Lib \
- python $(FONTCHAIN_LINTER) $(TARGET_OUT) $(CHECK_EMOJI) external/unicode
+ $(FONTCHAIN_LINTER) $(TARGET_OUT) $(CHECK_EMOJI) external/unicode