From 1b04588ea659d02225cb6031babab1b99b1399e1 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Wed, 11 Jul 2018 15:55:32 +0100 Subject: [PATCH] Merge generated greylists into final greylist. With annotations for greylist entries, each java target generates it own greylist.txt file. Merge all of these into the final greylist.txt. Bug: 110868826 Test: m Change-Id: I6a64c65000f1fd9f49e09b5b498bdccc3560d606 --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index eddcadae456b..88340e4369e9 100644 --- a/Android.mk +++ b/Android.mk @@ -654,7 +654,7 @@ $(LOCAL_LIGHT_GREYLIST): REGEX_SERIALIZATION := \ "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))) \