diff options
| author | Orion Hodson <oth@google.com> | 2020-08-07 15:44:46 +0100 |
|---|---|---|
| committer | Orion Hodson <oth@google.com> | 2020-08-17 15:35:31 +0100 |
| commit | 7cebdeeb53410548c2fad979b46f94d4e53c9733 (patch) | |
| tree | 0d9089e91a3f9ea289c4a0473f2a91526347b156 /config | |
| parent | 429b59c8a4b74ba603ea1ecf02feb016a95d0ef2 (diff) | |
profman: inclusive language updates
Based on:
https://source.android.com/setup/contribute/respectful-code
Bug: 161336379
Bug: 161896447
Test: m
Change-Id: Iaf7db2f76d8979f1ccc06c7e9e705b69c1f8069d
Diffstat (limited to 'config')
| -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 |
3 files changed, 5 insertions, 5 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 |