diff options
| author | Mathew Inwood <mathewi@google.com> | 2018-07-11 15:55:32 +0100 |
|---|---|---|
| committer | Mathew Inwood <mathewi@google.com> | 2018-07-23 18:06:58 +0100 |
| commit | 1b04588ea659d02225cb6031babab1b99b1399e1 (patch) | |
| tree | 1599c96356bd0e2649e3d880d8f182e06e32ed4a /Android.mk | |
| parent | 7f0aa734a3f4b3d1f7842b8546543668275f8ddb (diff) | |
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
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))) \ |