Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge generated greylists into final greylist."

Browse Source 
am: aa863ca68e

Change-Id: Ia2686a52c5f53f7a82d6dfb70c5c9cf9430443dd
This commit is contained in:
Mathew Inwood
2018-07-26 01:43:37 -07:00
committed by android-build-merger
parent 6722abdede aa863ca68e
commit ffc8ebefca
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -789,7 +789,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))) \