Merge "Use blocklist sub-property in sanitize" am: 1d87df7859 am: 7f229e6523 am: 5e143755b8 am: b3252fa9c4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375091 Change-Id: I4591886e2517ac371cbbb8449c68bde1b5b24fa3
2020-07-31 16:52:04 +00:00
parent 0569a540b2 b3252fa9c4
commit cea3df0007
2 changed files with 1 additions and 1 deletions
--- a/libs/androidfw/Android.bp
+++ b/libs/androidfw/Android.bp
@@ -101,7 +101,7 @@ cc_library {
        },
    },
    sanitize: {
-        blacklist: "libandroidfw_blacklist.txt",
+        blocklist: "libandroidfw_blocklist.txt",
    },
 }

--- a/libs/androidfw/libandroidfw_blocklist.txt
+++ b/libs/androidfw/libandroidfw_blocklist.txt