Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "profman: inclusive language updates"

Browse Source
This commit is contained in:
Treehugger Robot
2020-08-20 13:25:01 +00:00
committed by Gerrit Code Review
parent 4983d13ccc 7cebdeeb53
commit cde7692843
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/Android.bp
View File

@@ -13,6 +13,6 @@
// limitations under the License. // limitations under the License.
filegroup { filegroup {
name: "preloaded-classes-blacklist", name: "preloaded-classes-denylist",
srcs: ["preloaded-classes-blacklist"], srcs: ["preloaded-classes-denylist"],
} }

6
config/generate-preloaded-classes.sh
View File

@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
if [ "$#" -lt 2 ]; then 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 exit 1
fi fi
@@ -31,9 +31,9 @@ echo "# Preloaded-classes filter file for phones.
#" #"
input=$1 input=$1
blacklist=$2 denylist=$2
shift 2 shift 2
extra_classes_files=("$@") extra_classes_files=("$@")
# Disable locale to enable lexicographical sorting # 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"

0
config/preloaded-classes-blacklist → config/preloaded-classes-denylist
View File

2
tools/preload-check/Android.bp
View File

@@ -15,7 +15,7 @@
java_test_host { java_test_host {
name: "PreloadCheck", name: "PreloadCheck",
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],
java_resources: [":preloaded-classes-blacklist"], java_resources: [":preloaded-classes-denylist"],
libs: ["tradefed"], libs: ["tradefed"],
test_suites: ["general-tests"], test_suites: ["general-tests"],
required: ["preload-check-device"], required: ["preload-check-device"],

6
tools/preload-check/src/com/android/preload/check/PreloadCheck.java
View File

@@ -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 @Test
public void testBlackList() throws Exception { public void testDenyList() throws Exception {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
try (BufferedReader br = new BufferedReader(new InputStreamReader(getClass() try (BufferedReader br = new BufferedReader(new InputStreamReader(getClass()
.getResourceAsStream("/preloaded-classes-blacklist")))) { .getResourceAsStream("/preloaded-classes-denylist")))) {
String s; String s;
while ((s = br.readLine()) != null) { while ((s = br.readLine()) != null) {
s = s.trim(); s = s.trim();