From 38f19aac1f814c991eab6ecbd2f9651cf234c156 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Fri, 18 Jan 2019 15:11:01 +0000 Subject: [PATCH] Move HIDDENAPI_FLAGS dependencies to frameworks/base Recent move of hiddenapi rules to soong sets the dependencies of the hiddenapi_flags.csv rule in dex_preopt.mk but doesn't check for existence of "frameworks/base" as the hiddenapi-generate-csv rule in frameworks/base. Solve this by removing the dependency injection and using the SOONG_HIDDENAPI_FLAGS variable directly in frameworks/base. This is necessary because go/art-build creates a fake hiddenapi_flags.csv and if there is a dependency injection rule, a phony target is created and all dependencies of flags.csv need to be satisfied. Test: master-art compiles Change-Id: I13ef5e7ec167f9372a5629fe1894c7acd4091d29 --- core/dex_preopt.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index b3c0216574..102fb7570c 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -88,8 +88,6 @@ $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): $(HIDDENAPI) $(HIDDENAPI_STUBS) \ # Inputs to singleton rules located in frameworks/base # Additional inputs are filled with `hiddenapi-generate-csv` -$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): $(SOONG_HIDDENAPI_FLAGS) -$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): PRIVATE_FLAGS_INPUTS := $(SOONG_HIDDENAPI_FLAGS) $(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA): $(SOONG_HIDDENAPI_GREYLIST_METADATA) $(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA): PRIVATE_METADATA_INPUTS := $(SOONG_HIDDENAPI_GREYLIST_METADATA)