commit 4f895b2b168a42efbd57acc5704d837ebcfa5aac
author David Brazdil <dbrazdil@google.com> Fri Jan 18 15:17:43 2019 +0000
committer David Brazdil <dbrazdil@google.com> Fri Jan 18 16:18:06 2019 +0000
tree 47115f3879db504534987c2140ded2006c338fe1
parent 56401a4c74dc6acd307b4e3432bd86414a57176a

Add SOONG_HIDDENAPI_FLAGS as hiddenapi_flags.csv dependencies

Hiddenapi build logic has moved to soong and list of flags.csv files
is now being passed to make files through SOONG_HIDDENAPI_FLAGS
variable. Adjust the build rule for hiddenapi_flags.csv accordingly.

Test: aosp compiles
Change-Id: I930f918fb36ce3532478035e83c2632559fd07b6

Android.mk

diff --git a/Android.mk b/Android.mk
index e3cc275..9f7bf99 100644
--- a/Android.mk
+++ b/Android.mk
@@ -80,6 +80,8 @@
 # ==== hiddenapi lists =======================================
 .KATI_RESTAT: $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS)
 $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): \
+    PRIVATE_FLAGS_INPUTS := $(PRIVATE_FLAGS_INPUTS) $(SOONG_HIDDENAPI_FLAGS)
+$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): \
     frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py \
     frameworks/base/config/hiddenapi-greylist.txt \
     frameworks/base/config/hiddenapi-greylist-max-p.txt \
@@ -87,7 +89,8 @@
     frameworks/base/config/hiddenapi-force-blacklist.txt \
     $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \
     $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \
-    $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)
+    $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) \
+    $(SOONG_HIDDENAPI_FLAGS)
 	frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py \
 	    --public $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \
 	    --private $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \