diff options
| author | 2020-07-31 15:50:13 +0000 | |
|---|---|---|
| committer | 2020-07-31 15:50:13 +0000 | |
| commit | 7f229e652374eb98ea4d48e1ab9985d23fbffd2c (patch) | |
| tree | 0d34612cf80be07664a7f3ccb60999521c7fa7fe | |
| parent | 0fa2ec2c23549c020f2cc89a771566bdab43c1c0 (diff) | |
| parent | 1d87df78597fbd11539aed656420ff4d4392767e (diff) | |
Merge "Use blocklist sub-property in sanitize" am: 1d87df7859
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375091
Change-Id: I70207c753089ebdeba82b9041e9aab7cb6501b52
| -rw-r--r-- | libs/androidfw/Android.bp | 2 | ||||
| -rw-r--r-- | libs/androidfw/libandroidfw_blocklist.txt (renamed from libs/androidfw/libandroidfw_blacklist.txt) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp index eeaefc5b157c..a35143756d65 100644 --- a/libs/androidfw/Android.bp +++ b/libs/androidfw/Android.bp @@ -103,7 +103,7 @@ cc_library { }, }, sanitize: { - blacklist: "libandroidfw_blacklist.txt", + blocklist: "libandroidfw_blocklist.txt", }, } diff --git a/libs/androidfw/libandroidfw_blacklist.txt b/libs/androidfw/libandroidfw_blocklist.txt index dd17e4d5b1e8..dd17e4d5b1e8 100644 --- a/libs/androidfw/libandroidfw_blacklist.txt +++ b/libs/androidfw/libandroidfw_blocklist.txt |