commit 9f31b97f5e10f3b6bf47496b6bd28f44ae8b5ce2
author Mathieu Chartier <mathieuc@google.com> Thu Jun 07 14:30:24 2018 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Jun 07 14:30:24 2018 -0700
tree 57c1437075520d736a6ac50223e6a69b2aa8d9d5
parent b62aa315d1d9d27c716964930205ed0681e8997b

Add filter for NoPreloadHolders

Avoid including these in the preloaded classes.

Test: manual
Bug: 109652611
Change-Id: I1efd1749e54e8b38ca8f7e3ff05058ddb0fe4460

config/generate-preloaded-classes.sh

diff --git a/config/generate-preloaded-classes.sh b/config/generate-preloaded-classes.sh
index e36e148..0ad3a02 100755
--- a/config/generate-preloaded-classes.sh
+++ b/config/generate-preloaded-classes.sh
@@ -36,4 +36,4 @@
 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"