diff options
| author | Nan Zhang <nanzhang@google.com> | 2017-11-08 20:48:46 -0800 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2017-11-17 09:22:12 -0800 |
| commit | 2db709de30688a5761b45116639bada335aae3b7 (patch) | |
| tree | 4f9bdfe3880a94ec8ee0af39dd67e67b38d2d002 | |
| parent | 413a30812669dd34f73b748a9574308fc6a16d45 (diff) | |
Build fontchain_lint using python_binary_host
Test: out/host/linux-x86/bin/fontchain_lint
out/target/product/generic/system true external/unicode
Bug: b/27727331
Change-Id: Ib9353d2338c3b939027069f49e3e847c65526581
| -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 7d75f62ee183..1f4c59a407ed 100644 --- a/Android.bp +++ b/Android.bp @@ -102,3 +102,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 c6ad4c2aa396..c6ad4c2aa396 100755 --- a/tools/fonts/fontchain_lint.py +++ b/tools/fonts/fontchain_linter.py |