Skip to content
Snippets Groups Projects
Commit 7cebdeeb authored by Orion Hodson's avatar Orion Hodson
Browse files

profman: inclusive language updates

Based on:
  https://source.android.com/setup/contribute/respectful-code

Bug: 161336379
Bug: 161896447
Test: m
Change-Id: Iaf7db2f76d8979f1ccc06c7e9e705b69c1f8069d
parent 429b59c8
No related branches found
No related tags found
No related merge requests found
......@@ -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"],
}
......@@ -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"
......@@ -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"],
......
......@@ -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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment