Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffc8ebef authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Merge generated greylists into final greylist." 

am: aa863ca6

Change-Id: Ia2686a52c5f53f7a82d6dfb70c5c9cf9430443dd
parents 6722abde aa863ca6

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -789,7 +789,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))) \