diff options
| author | Nan Zhang <nanzhang@google.com> | 2017-11-17 22:30:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-17 22:30:37 +0000 |
| commit | 24c992479799c8330f6b837d504bac7970310947 (patch) | |
| tree | 4d8c4df0319c7930dcc9dcb96a589f0f8af014fc | |
| parent | 344072e2f678cf02b597e16a078c05ef270a4b5d (diff) | |
| parent | 67695d3aff7553f80bbcda88e6a2c1c0cb9f7632 (diff) | |
Merge "Build fontchain_lint using python_binary_host" am: 7ecac139ea am: 7ade558ad2
am: 67695d3aff
Change-Id: I850304f79c1c35bfeb6951307b8ca2365da0330b
| -rw-r--r-- | Android.bp | 26 | ||||
| -rw-r--r-- | data/fonts/Android.mk | 5 | ||||
| -rwxr-xr-x | tools/fonts/fontchain_linter.py (renamed from tools/fonts/fontchain_lint.py) | 0 |
3 files changed, 28 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index 24a9bca1844c..a740e22686b1 100644 --- a/Android.bp +++ b/Android.bp @@ -132,3 +132,29 @@ java_library { dxflags: ["--core-library"], installable: false, } + +python_defaults { + name: "base_default", + version: { + py2: { + enabled: true, + embedded_launcher: true, + }, + py3: { + enabled: false, + embedded_launcher: false, + }, + }, +} + +python_binary_host { + name: "fontchain_linter", + defaults: ["base_default"], + main: "tools/fonts/fontchain_linter.py", + srcs: [ + "tools/fonts/fontchain_linter.py", + ], + libs: [ + "fontTools", + ], +} 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 diff --git a/tools/fonts/fontchain_lint.py b/tools/fonts/fontchain_linter.py index dcb90e411d34..dcb90e411d34 100755 --- a/tools/fonts/fontchain_lint.py +++ b/tools/fonts/fontchain_linter.py |