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

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

Merge "Merge generated greylists into final greylist." am: aa863ca6 am: ffc8ebef am: ce379ca0 

am: 83daaf75

Change-Id: I0527248015d903ea0518455be229743093d52814
parents 22f30447 83daaf75

Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -772,7 +772,7 @@ $(LOCAL_LIGHT_GREYLIST): REGEX_SERIALIZATION := \ 
    "writeObject\(Ljava/io/ObjectOutputStream;\)V" \

    "writeObject\(Ljava/io/ObjectOutputStream;\)V" \

    "writeReplace\(\)Ljava/lang/Object;"

    "writeReplace\(\)Ljava/lang/Object;"

$(LOCAL_LIGHT_GREYLIST): $(LOCAL_SRC_ALL)

$(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))")$$" \

	     <(grep -E "\->("$(subst $(space),"|",$(REGEX_SERIALIZATION))")$$" \

	               $(LOCAL_SRC_PRIVATE_API)) \

	               $(LOCAL_SRC_PRIVATE_API)) \

	     <(comm -12 <(sort $(LOCAL_SRC_REMOVED_API)) <(sort $(LOCAL_SRC_PRIVATE_API))) \

	     <(comm -12 <(sort $(LOCAL_SRC_REMOVED_API)) <(sort $(LOCAL_SRC_PRIVATE_API))) \