Merge "Merge "Add filter for NoPreloadHolders" am: 88ee5c93bb am: 202e61f127" into pi-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2018-06-08 04:15:24 +00:00
committed by Android (Google) Code Review

View File

@@ -36,4 +36,4 @@ shift 2
extra_classes_files=("$@") extra_classes_files=("$@")
# Disable locale to enable lexicographical sorting # Disable locale to enable lexicographical sorting
LC_ALL=C sort "$input" "${extra_classes_files[@]}" | uniq | grep -f "$blacklist" -v -F -x LC_ALL=C sort "$input" "${extra_classes_files[@]}" | uniq | grep -f "$blacklist" -v -F -x | grep -v "\$NoPreloadHolder"