From 081a589ad997e30062bfb9c6cd18f77d9cae0245 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Thu, 6 Sep 2018 12:15:11 +0100 Subject: [PATCH] Mark hidden API lists .KATI_RESTAT Change hidden API list generation build rule so that it checks if outputs have changed and only commit them when changes have been made. .KATI_RESTAT instructs ninja to restat the outputs and remove reverse dependencies when rebuilding dependencies is not needed. Bug: 113278235 Test: m appcompat Change-Id: Ic3ec82534a6d79b6a85f865a6e9eb5f0b3f12424 --- Android.mk | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index 47e861ac754c..abfdb8bef0cd 100644 --- a/Android.mk +++ b/Android.mk @@ -322,6 +322,11 @@ $(OUT_DOCS)/offline-sdk-timestamp: $(OUT_DOCS)/offline-sdk-docs-docs.zip ( unzip -qo $< -d $(OUT_DOCS)/offline-sdk && touch -f $@ ) || exit 1 # ==== hiddenapi lists ======================================= +.KATI_RESTAT: \ + $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST) \ + $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ + $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \ + $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \ .KATI_IMPLICIT_OUTPUTS := \ $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ @@ -348,10 +353,14 @@ $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \ $(PRIVATE_GREYLIST_INPUTS) \ --input-dark-greylists frameworks/base/config/hiddenapi-dark-greylist.txt \ --input-blacklists frameworks/base/config/hiddenapi-force-blacklist.txt \ - --output-whitelist $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST) \ - --output-light-greylist $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ - --output-dark-greylist $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \ - --output-blacklist $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) + --output-whitelist $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST).tmp \ + --output-light-greylist $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST).tmp \ + --output-dark-greylist $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST).tmp \ + --output-blacklist $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST).tmp + $(call commit-change-for-toc,$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST)) + $(call commit-change-for-toc,$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)) + $(call commit-change-for-toc,$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)) + $(call commit-change-for-toc,$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)) # Include subdirectory makefiles # ============================================================