commit aa863ca68eddbccef374e2ac283981e94d8629aa
author Mathew Inwood <mathewi@google.com> Thu Jul 26 07:37:29 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 26 07:37:29 2018 +0000
tree e654d6935fa8fee74763ffe2c49ee3efc1a10d4c
parent 9119e2e49d82d59a563f848967c499e989888563
parent 1b04588ea659d02225cb6031babab1b99b1399e1

Merge "Merge generated greylists into final greylist."

Android.mk

diff --git a/Android.mk b/Android.mk
index eddcada..88340e4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -654,7 +654,7 @@
     "writeObject\(Ljava/io/ObjectOutputStream;\)V" \
     "writeReplace\(\)Ljava/lang/Object;"
 $(LOCAL_LIGHT_GREYLIST): $(LOCAL_SRC_ALL)
-	sort $(LOCAL_SRC_GREYLIST) $(LOCAL_SRC_VENDOR_LIST) \
+	sort $(LOCAL_SRC_GREYLIST) $(LOCAL_SRC_VENDOR_LIST) $(PRIVATE_GREYLIST_INPUTS) \
 	     <(grep -E "\->("$(subst $(space),"|",$(REGEX_SERIALIZATION))")$$" \
 	               $(LOCAL_SRC_PRIVATE_API)) \
 	     <(comm -12 <(sort $(LOCAL_SRC_REMOVED_API)) <(sort $(LOCAL_SRC_PRIVATE_API))) \