Merge "Build fontchain_lint using python_binary_host" (7ecac139) · Commits · e / os / android_frameworks_base

Android.bp

+26 −0

Original line number	Original line	Diff line number	Diff line
	@@ -102,3 +102,29 @@ java_library {
	dxflags: ["--core-library"],		dxflags: ["--core-library"],
	installable: false,		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",
			],
			}

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -112,7 +112,7 @@ include $(BUILD_PREBUILT)
	# Run sanity tests on fonts on checkbuild		# Run sanity tests on fonts on checkbuild
	checkbuild: fontchain_lint		checkbuild: fontchain_lint

	FONTCHAIN_LINTER := frameworks/base/tools/fonts/fontchain_lint.py		FONTCHAIN_LINTER := $(HOST_OUT_EXECUTABLES)/fontchain_linter
	ifeq ($(MINIMAL_FONT_FOOTPRINT),true)		ifeq ($(MINIMAL_FONT_FOOTPRINT),true)
	CHECK_EMOJI := false		CHECK_EMOJI := false
	else		else
	@@ -121,5 +121,4 @@ endif

	.PHONY: fontchain_lint		.PHONY: fontchain_lint
	fontchain_lint: $(FONTCHAIN_LINTER) $(TARGET_OUT)/etc/fonts.xml $(PRODUCT_OUT)/system.img		fontchain_lint: $(FONTCHAIN_LINTER) $(TARGET_OUT)/etc/fonts.xml $(PRODUCT_OUT)/system.img
	PYTHONPATH=$$PYTHONPATH:external/fonttools/Lib \		$(FONTCHAIN_LINTER) $(TARGET_OUT) $(CHECK_EMOJI) external/unicode
	python $(FONTCHAIN_LINTER) $(TARGET_OUT) $(CHECK_EMOJI) external/unicode

+0 −0

File moved.