From 9f31b97f5e10f3b6bf47496b6bd28f44ae8b5ce2 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Thu, 7 Jun 2018 14:30:24 -0700 Subject: [PATCH] Add filter for NoPreloadHolders Avoid including these in the preloaded classes. Test: manual Bug: 109652611 Change-Id: I1efd1749e54e8b38ca8f7e3ff05058ddb0fe4460 --- config/generate-preloaded-classes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/generate-preloaded-classes.sh b/config/generate-preloaded-classes.sh index e36e148c74761..0ad3a0263d955 100755 --- a/config/generate-preloaded-classes.sh +++ b/config/generate-preloaded-classes.sh @@ -36,4 +36,4 @@ shift 2 extra_classes_files=("$@") # 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"