commit 354cc2dde64e9805c2114819722e7b49c2ef977d
author David Brazdil <dbrazdil@google.com> Thu Aug 30 17:59:02 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 30 17:59:02 2018 +0000
tree 2f2a44ea34d3394b45571ffc12c26aa410c83d81
parent d74327b7a4ed0c725dc0ada99685116d01497b9b
parent cf163d38d6ba1c8a9a5d37498afc4350ba800b1b

Merge "Adjust build rule for hidden API list generation"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 3d9c140..fa7e052 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2879,12 +2879,10 @@
 	$(CLASS2GREYLIST) --public-api-list $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) $(1) \
 	    --write-whitelist $(2) --write-greylist $(3)
 
-$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): $(2)
+$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): $(2) $(3)
 $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \
     PRIVATE_WHITELIST_INPUTS := $$(PRIVATE_WHITELIST_INPUTS) $(2)
-
-$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): $(3)
-$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): \
+$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \
     PRIVATE_GREYLIST_INPUTS := $$(PRIVATE_GREYLIST_INPUTS) $(3)
 endif
 endef