diff options
| -rw-r--r-- | config/Android.bp | 4 | ||||
| -rwxr-xr-x | config/generate-preloaded-classes.sh | 6 | ||||
| -rw-r--r-- | config/preloaded-classes-denylist (renamed from config/preloaded-classes-blacklist) | 0 | ||||
| -rw-r--r-- | tools/preload-check/Android.bp | 2 | ||||
| -rw-r--r-- | tools/preload-check/src/com/android/preload/check/PreloadCheck.java | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/config/Android.bp b/config/Android.bp index 0fb56cb3410a..8dd409b51eee 100644 --- a/config/Android.bp +++ b/config/Android.bp @@ -13,6 +13,6 @@ // limitations under the License. filegroup { - name: "preloaded-classes-blacklist", - srcs: ["preloaded-classes-blacklist"], + name: "preloaded-classes-denylist", + srcs: ["preloaded-classes-denylist"], } diff --git a/config/generate-preloaded-classes.sh b/config/generate-preloaded-classes.sh index 0ad3a0263d95..b17a3660e1f1 100755 --- a/config/generate-preloaded-classes.sh +++ b/config/generate-preloaded-classes.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. if [ "$#" -lt 2 ]; then - echo "Usage $0 <input classes file> <blacklist file> [extra classes files]" + echo "Usage $0 <input classes file> <denylist file> [extra classes files]" exit 1 fi @@ -31,9 +31,9 @@ echo "# Preloaded-classes filter file for phones. #" input=$1 -blacklist=$2 +denylist=$2 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 | grep -v "\$NoPreloadHolder" +LC_ALL=C sort "$input" "${extra_classes_files[@]}" | uniq | grep -f "$denylist" -v -F -x | grep -v "\$NoPreloadHolder" diff --git a/config/preloaded-classes-blacklist b/config/preloaded-classes-denylist index 48d579cc118e..48d579cc118e 100644 --- a/config/preloaded-classes-blacklist +++ b/config/preloaded-classes-denylist diff --git a/tools/preload-check/Android.bp b/tools/preload-check/Android.bp index 87b31d22af32..aaa6d76b39e3 100644 --- a/tools/preload-check/Android.bp +++ b/tools/preload-check/Android.bp @@ -15,7 +15,7 @@ java_test_host { name: "PreloadCheck", srcs: ["src/**/*.java"], - java_resources: [":preloaded-classes-blacklist"], + java_resources: [":preloaded-classes-denylist"], libs: ["tradefed"], test_suites: ["general-tests"], required: ["preload-check-device"], diff --git a/tools/preload-check/src/com/android/preload/check/PreloadCheck.java b/tools/preload-check/src/com/android/preload/check/PreloadCheck.java index 00fd414e3ee2..3d851531d7e7 100644 --- a/tools/preload-check/src/com/android/preload/check/PreloadCheck.java +++ b/tools/preload-check/src/com/android/preload/check/PreloadCheck.java @@ -69,13 +69,13 @@ public class PreloadCheck implements IDeviceTest { } /** - * Test the classes mentioned in the embedded preloaded-classes blacklist. + * Test the classes mentioned in the embedded preloaded-classes denylist. */ @Test - public void testBlackList() throws Exception { + public void testDenyList() throws Exception { StringBuilder sb = new StringBuilder(); try (BufferedReader br = new BufferedReader(new InputStreamReader(getClass() - .getResourceAsStream("/preloaded-classes-blacklist")))) { + .getResourceAsStream("/preloaded-classes-denylist")))) { String s; while ((s = br.readLine()) != null) { s = s.trim(); |