From f5de525ee3547b8a69a21aec1e1a3175bc06f442 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 10 Nov 2017 20:30:56 -0800 Subject: [PATCH] Add output file and dependencies to fontchain_lint Keep fontchain_lint from rerunning on every make checkbuild by making it touch an output file and giving it dependencies on anything that should cause it to rerun. Bug: 27727331 Test: m checkbuild Change-Id: I0d8a41b308cac04844e27beb51c12dbf46cb1a4a --- data/fonts/Android.mk | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 81164d5e63a0d..76eb4e6769235 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -119,6 +119,22 @@ else CHECK_EMOJI := true endif +fontchain_lint_timestamp := $(call intermediates-dir-for,PACKAGING,fontchain_lint)/stamp + .PHONY: fontchain_lint -fontchain_lint: $(FONTCHAIN_LINTER) $(TARGET_OUT)/etc/fonts.xml $(PRODUCT_OUT)/system.img +fontchain_lint: $(fontchain_lint_timestamp) + +fontchain_lint_deps := \ + external/unicode/DerivedAge.txt \ + external/unicode/emoji-data.txt \ + external/unicode/emoji-sequences.txt \ + external/unicode/emoji-variation-sequences.txt \ + external/unicode/emoji-zwj-sequences.txt \ + external/unicode/additions/emoji-data.txt \ + external/unicode/additions/emoji-sequences.txt \ + external/unicode/additions/emoji-zwj-sequences.txt \ + +$(fontchain_lint_timestamp): $(FONTCHAIN_LINTER) $(TARGET_OUT)/etc/fonts.xml $(PRODUCT_OUT)/system.img $(fontchain_lint_deps) + @echo Running fontchain lint $(FONTCHAIN_LINTER) $(TARGET_OUT) $(CHECK_EMOJI) external/unicode + touch $@