diff options
| author | Mathew Inwood <mathewi@google.com> | 2018-07-26 07:37:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-26 07:37:29 +0000 |
| commit | aa863ca68eddbccef374e2ac283981e94d8629aa (patch) | |
| tree | e654d6935fa8fee74763ffe2c49ee3efc1a10d4c /Android.mk | |
| parent | 9119e2e49d82d59a563f848967c499e989888563 (diff) | |
| parent | 1b04588ea659d02225cb6031babab1b99b1399e1 (diff) | |
Merge "Merge generated greylists into final greylist."
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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))) \ |