diff options
| author | Mathew Inwood <mathewi@google.com> | 2018-07-26 01:43:37 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-26 01:43:37 -0700 |
| commit | ffc8ebefcadc404a756b7de93fcd4aea3c8a60e9 (patch) | |
| tree | eed29455336c1764ea570f7a08bc51e28934b2e2 | |
| parent | 6722abdede258f834fa4bb56ff17141fb9ba7a9b (diff) | |
| parent | aa863ca68eddbccef374e2ac283981e94d8629aa (diff) | |
Merge "Merge generated greylists into final greylist."
am: aa863ca68e
Change-Id: Ia2686a52c5f53f7a82d6dfb70c5c9cf9430443dd
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 46c1201bf4f8..741d2b61dc55 100644 --- a/Android.mk +++ b/Android.mk @@ -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))) \ |